Skipping 97 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-05 00:41:30,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:41:30,722 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:41:31,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2025-01-05 00:41:31,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2025-01-05 00:41:32,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2025-01-05 00:41:32,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2025-01-05 00:41:32,648 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:41:32,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-05 00:41:32,648 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:32,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:32,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:41:32,660 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:41:32,660 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:41:32,666 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:41:32,671 [ scc.git] DEBUG Already up to date.
2025-01-05 00:41:32,672 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:41:32,672 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:32,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:32,677 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:41:32,723 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:32,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:32,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:41:32,769 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:41:32,777 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228cef50a0> has no local changes
2025-01-05 00:41:32,777 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:41:32,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:41:32,787 [ scc.git] DEBUG [detached HEAD fe81e427] merge master -Dorg -Ssuccess-only
2025-01-05 00:41:32,788 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:41:33,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-05 00:41:33,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-05 00:41:34,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-05 00:41:34,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-05 00:41:35,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:35,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-05 00:41:36,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:36,083 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-05 00:41:36,084 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:41:36,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-05 00:41:36,084 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:36,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:36,092 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:41:36,097 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:41:36,097 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:41:36,103 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:41:36,111 [ scc.git] DEBUG Already up to date.
2025-01-05 00:41:36,111 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-05 00:41:36,453 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-05 00:41:36,453 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-05 00:41:36,457 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:41:36,458 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:36,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:36,463 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-05 00:41:36,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:36,474 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-05 00:41:36,518 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-05 00:41:36,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:41:36,522 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-05 00:41:36,522 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-05 00:41:36,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:41:36,669 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:41:36,710 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:36,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:36,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:41:36,760 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:41:36,769 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228dfc59d0> has no local changes
2025-01-05 00:41:36,769 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:41:36,779 [ scc.git] DEBUG [detached HEAD dddaa67] merge master -Dorg -Ssuccess-only
2025-01-05 00:41:36,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:41:36,780 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:41:37,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-05 00:41:37,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-05 00:41:38,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-05 00:41:38,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-05 00:41:38,715 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:39,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-05 00:41:39,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:40,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:40,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-05 00:41:41,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:41,282 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-05 00:41:41,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-05 00:41:41,725 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:42,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-05 00:41:42,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:43,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:43,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-05 00:41:44,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:44,112 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-05 00:41:44,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-05 00:41:44,556 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:45,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-05 00:41:45,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:46,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:46,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-05 00:41:47,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:47,115 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-05 00:41:47,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-05 00:41:47,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-05 00:41:47,995 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:48,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-05 00:41:49,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:49,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:50,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-05 00:41:50,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:50,577 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-05 00:41:51,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-05 00:41:51,062 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:51,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-05 00:41:52,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:52,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:53,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-05 00:41:53,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:53,438 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-05 00:41:53,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-05 00:41:53,897 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:41:54,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-05 00:41:54,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:41:55,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:41:55,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-05 00:41:56,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:41:56,394 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-05 00:41:56,394 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:41:56,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-05 00:41:56,395 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:56,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:56,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:41:56,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:41:56,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:41:56,419 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:41:56,426 [ scc.git] DEBUG Already up to date.
2025-01-05 00:41:56,426 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-05 00:41:56,749 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:56,749 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-05 00:41:56,754 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-05 00:41:57,059 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:57,060 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-05 00:41:57,064 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-05 00:41:57,394 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:57,395 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-05 00:41:57,400 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-05 00:41:57,686 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:57,687 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-05 00:41:57,691 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-05 00:41:57,981 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:57,981 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-05 00:41:57,986 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-05 00:41:58,281 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-05 00:41:58,281 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-05 00:41:58,287 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:41:58,287 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:41:58,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:58,294 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-05 00:41:58,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:58,316 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-05 00:41:58,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:41:58,358 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-05 00:41:58,358 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-05 00:41:58,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:41:58,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-05 00:41:58,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:58,534 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-05 00:41:58,597 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-05 00:41:58,598 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:41:58,603 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-05 00:41:58,603 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-05 00:41:58,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:41:58,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-05 00:41:58,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:58,907 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-05 00:41:58,949 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-05 00:41:58,949 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-05 00:41:58,949 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:41:58,950 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:41:58,956 [ scc.git] DEBUG Calling 'git reset --hard 8e9b39e0e2348391e8d20c612bce4d59b5f29253'
2025-01-05 00:41:58,965 [ scc.git] DEBUG HEAD is now at 8e9b39e merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-05 00:41:59,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:41:59,272 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-05 00:41:59,278 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-05 00:41:59,285 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-05 00:41:59,289 [ scc.config] DEBUG Found github.token
2025-01-05 00:41:59,290 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-05 00:41:59,290 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-05 00:41:59,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:59,383 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-05 00:41:59,449 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-05 00:41:59,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:41:59,455 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-05 00:41:59,455 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-05 00:41:59,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:41:59,674 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-05 00:41:59,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:41:59,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-05 00:41:59,751 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-05 00:41:59,751 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:41:59,756 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-05 00:41:59,756 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-05 00:42:00,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:00,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-05 00:42:00,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:00,099 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-05 00:42:00,188 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-05 00:42:00,189 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-05 00:42:00,189 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:42:00,189 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:42:00,198 [ scc.git] DEBUG Calling 'git reset --hard 145404a1e5900a8a158944332496eb25d1bf49e5'
2025-01-05 00:42:00,210 [ scc.git] DEBUG HEAD is now at 145404a merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-05 00:42:00,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:00,491 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-05 00:42:00,498 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-05 00:42:00,506 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-05 00:42:00,512 [ scc.config] DEBUG Found github.token
2025-01-05 00:42:00,513 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-05 00:42:00,513 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:00,558 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:00,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:00,565 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:00,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:00,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228ced7b80> has no local changes
2025-01-05 00:42:00,617 [ 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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:00,627 [ scc.git] DEBUG [detached HEAD d54c88b] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:00,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:00,628 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:00,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-05 00:42:01,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-05 00:42:01,495 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-05 00:42:02,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-05 00:42:02,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:42:03,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:42:03,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-05 00:42:03,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:03,978 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-05 00:42:04,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-05 00:42:04,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-05 00:42:05,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-05 00:42:05,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-05 00:42:06,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-05 00:42:06,760 [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
2025-01-05 00:42:07,250 [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
2025-01-05 00:42:07,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-05 00:42:08,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:08,197 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-05 00:42:08,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-05 00:42:09,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-05 00:42:09,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-05 00:42:10,248 [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
2025-01-05 00:42:10,733 [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
2025-01-05 00:42:11,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-05 00:42:11,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:11,724 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-05 00:42:12,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-05 00:42:12,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-05 00:42:13,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-05 00:42:13,580 [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
2025-01-05 00:42:14,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-05 00:42:14,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:14,547 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-05 00:42:14,548 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:14,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-05 00:42:14,548 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:14,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:14,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:14,560 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:14,560 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:14,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:14,593 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:14,593 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-05 00:42:14,953 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-05 00:42:14,953 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-05 00:42:14,959 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-05 00:42:15,923 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-05 00:42:15,924 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-05 00:42:15,929 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-05 00:42:16,279 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-05 00:42:16,280 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-05 00:42:16,285 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-05 00:42:16,574 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-05 00:42:16,575 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-05 00:42:16,579 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:16,579 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:16,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:16,585 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-05 00:42:16,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:16,599 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-05 00:42:16,665 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-05 00:42:16,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:16,669 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-05 00:42:16,669 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-05 00:42:16,669 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-05 00:42:16,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:16,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-05 00:42:16,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:16,816 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-05 00:42:16,868 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-05 00:42:16,869 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-05 00:42:16,869 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-05 00:42:16,869 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-05 00:42:16,869 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:16,874 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-05 00:42:16,874 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-05 00:42:16,874 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-05 00:42:16,874 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-05 00:42:16,874 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-05 00:42:16,874 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-05 00:42:16,875 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-05 00:42:16,875 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-05 00:42:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:17,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-05 00:42:17,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:17,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-05 00:42:17,234 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-05 00:42:17,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:17,238 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-05 00:42:17,239 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-05 00:42:17,239 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-05 00:42:17,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:17,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-05 00:42:17,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:17,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-05 00:42:17,647 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:17,657 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-05 00:42:17,657 [ scc.git] DEBUG package.json | 2 +-
2025-01-05 00:42:17,657 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-05 00:42:17,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:17,974 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:18,020 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:18,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:18,028 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:18,077 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:18,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228ce8ef40> has no local changes
2025-01-05 00:42:18,088 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- 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 499 dependabot[bot] 'Bump nanoid and mocha'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:18,098 [ scc.git] DEBUG [detached HEAD ec67a3e] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:18,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:18,098 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:18,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-05 00:42:18,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-05 00:42:19,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-05 00:42:20,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-05 00:42:20,601 [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
2025-01-05 00:42:21,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-05 00:42:21,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:21,681 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-05 00:42:21,681 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:21,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-05 00:42:21,682 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:21,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:21,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:21,695 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:21,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:21,702 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:21,709 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:21,709 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-05 00:42:22,198 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-05 00:42:22,198 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-05 00:42:22,204 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:22,204 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:22,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:22,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-05 00:42:22,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:22,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-05 00:42:22,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:22,242 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-05 00:42:22,242 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-05 00:42:22,242 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-05 00:42:22,242 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-05 00:42:22,242 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-05 00:42:22,242 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-05 00:42:22,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:22,382 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:22,429 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:22,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:22,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:22,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:22,488 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c66c520> has no local changes
2025-01-05 00:42:22,488 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:22,499 [ scc.git] DEBUG [detached HEAD 5d64cfc] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:22,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:22,500 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:22,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-05 00:42:23,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-05 00:42:24,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-05 00:42:24,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-05 00:42:24,993 [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
2025-01-05 00:42:25,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-05 00:42:25,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:25,896 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-05 00:42:26,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-05 00:42:26,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-05 00:42:27,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-05 00:42:27,772 [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
2025-01-05 00:42:28,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-05 00:42:28,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:28,679 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-05 00:42:28,679 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:28,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-05 00:42:28,679 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:28,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:28,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:28,692 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:28,693 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:28,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:28,706 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:28,707 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-05 00:42:29,221 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-05 00:42:29,221 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-05 00:42:29,226 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-05 00:42:29,710 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-05 00:42:29,711 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-05 00:42:29,716 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:29,716 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:29,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:29,723 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-05 00:42:29,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:29,736 [ 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'
2025-01-05 00:42:29,861 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-05 00:42:29,861 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-05 00:42:29,861 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-05 00:42:29,861 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-05 00:42:29,861 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:42:29,862 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:42:29,869 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-05 00:42:29,876 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-05 00:42:30,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:30,027 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-05 00:42:30,036 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-05 00:42:30,082 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-05 00:42:30,088 [ scc.config] DEBUG Found github.token
2025-01-05 00:42:30,088 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-05 00:42:30,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-05 00:42:30,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:30,102 [ 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'
2025-01-05 00:42:30,197 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-05 00:42:30,197 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-05 00:42:30,197 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-05 00:42:30,197 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:42:30,198 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:42:30,205 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-05 00:42:30,213 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-05 00:42:30,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:30,424 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-05 00:42:30,432 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-05 00:42:30,438 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/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
2025-01-05 00:42:30,443 [ scc.config] DEBUG Found github.token
2025-01-05 00:42:30,443 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-05 00:42:30,443 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:30,486 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:30,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:30,492 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:30,535 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:30,543 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c67eb20> has no local changes
2025-01-05 00:42:30,544 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:30,554 [ scc.git] DEBUG [detached HEAD 301f048] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:30,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:30,555 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:30,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-05 00:42:31,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-05 00:42:31,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-05 00:42:32,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-05 00:42:32,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-05 00:42:33,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-05 00:42:33,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-05 00:42:34,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-05 00:42:34,310 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:34,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-05 00:42:34,310 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,316 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:34,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:34,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:34,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:34,334 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:34,334 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:34,334 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,340 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:34,389 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,396 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:34,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:34,441 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c622880> has no local changes
2025-01-05 00:42:34,442 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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.
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:34,452 [ scc.git] DEBUG [detached HEAD 13512f8] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:34,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:34,453 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:34,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-05 00:42:34,718 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:34,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-05 00:42:34,718 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:34,729 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:34,729 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:34,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:34,742 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:34,742 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:34,742 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,747 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:34,788 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:34,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:34,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:34,842 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:34,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c6226a0> has no local changes
2025-01-05 00:42:34,849 [ 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.
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:34,860 [ scc.git] DEBUG [detached HEAD 79be286] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:34,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:34,860 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:35,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-05 00:42:35,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-05 00:42:36,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-05 00:42:36,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-05 00:42:37,147 [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
2025-01-05 00:42:37,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-05 00:42:38,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:38,031 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-05 00:42:38,031 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:38,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-05 00:42:38,031 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:38,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:38,037 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:38,042 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:38,043 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:38,049 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:38,056 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:38,056 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-05 00:42:38,498 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-05 00:42:38,498 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-05 00:42:38,503 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:38,503 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:38,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:38,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-05 00:42:38,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:38,522 [ 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'
2025-01-05 00:42:38,532 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-05 00:42:38,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:38,536 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-05 00:42:38,536 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-05 00:42:38,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:38,670 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:38,713 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:38,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:38,722 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:38,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:38,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c5dc5b0> has no local changes
2025-01-05 00:42:38,780 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:38,791 [ scc.git] DEBUG [detached HEAD 3702a98] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:38,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:38,792 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:39,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-05 00:42:39,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-05 00:42:40,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-05 00:42:40,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-05 00:42:41,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:42:41,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-05 00:42:41,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:41,964 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-05 00:42:41,964 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:41,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-05 00:42:41,964 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:41,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:41,970 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:41,976 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:41,976 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:41,982 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:41,988 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:41,989 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-05 00:42:42,379 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-05 00:42:42,379 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-05 00:42:42,385 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:42,385 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:42,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:42,391 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-05 00:42:42,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:42,406 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-05 00:42:42,514 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG Auto-merging setup.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-05 00:42:42,514 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:42:42,515 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:42:42,522 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-05 00:42:42,530 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-05 00:42:42,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:42,743 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-05 00:42:42,751 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-05 00:42:42,792 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2025-01-05 00:42:42,797 [ scc.config] DEBUG Found github.token
2025-01-05 00:42:42,798 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-05 00:42:42,798 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:42,839 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:42,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:42,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:42,886 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:42,892 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c5dc7f0> has no local changes
2025-01-05 00:42:42,893 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:42,903 [ scc.git] DEBUG [detached HEAD 594a642] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:42,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:42,904 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:43,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-05 00:42:43,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-05 00:42:44,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-05 00:42:44,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-05 00:42:45,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:42:45,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:42:46,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-05 00:42:46,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-05 00:42:47,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-05 00:42:47,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-05 00:42:48,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-05 00:42:48,520 [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
2025-01-05 00:42:48,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-05 00:42:49,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:49,355 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-05 00:42:49,356 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:49,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-05 00:42:49,356 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:49,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:49,363 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:49,369 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:49,369 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:49,376 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:49,383 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:49,384 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-05 00:42:49,775 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-05 00:42:49,775 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-05 00:42:49,780 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:49,780 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:49,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:49,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-05 00:42:49,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:49,801 [ 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'
2025-01-05 00:42:49,892 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:49,895 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-05 00:42:49,895 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-05 00:42:49,895 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-05 00:42:49,895 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-05 00:42:49,895 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-05 00:42:49,897 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-05 00:42:49,898 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-05 00:42:49,898 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-05 00:42:49,898 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-05 00:42:49,899 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-05 00:42:50,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:50,039 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:50,090 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:50,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:50,097 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:50,137 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:50,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c5dc610> has no local changes
2025-01-05 00:42:50,145 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:50,153 [ scc.git] DEBUG [detached HEAD 6b2f0d7] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:50,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:50,154 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:50,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-05 00:42:50,438 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:50,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-05 00:42:50,438 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:50,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:50,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:50,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:50,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:50,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:50,463 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:50,464 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:50,464 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:50,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:50,469 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:50,510 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:50,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:50,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:50,557 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:50,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c649490> has no local changes
2025-01-05 00:42:50,565 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:50,574 [ scc.git] DEBUG [detached HEAD 1c91e36] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:50,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:50,575 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:50,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-05 00:42:51,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-05 00:42:51,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-05 00:42:52,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-05 00:42:53,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:42:53,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:42:54,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-05 00:42:54,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:42:54,608 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-05 00:42:54,608 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:42:54,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-05 00:42:54,608 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:54,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:54,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:42:54,620 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:42:54,620 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:42:54,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:42:54,631 [ scc.git] DEBUG Already up to date.
2025-01-05 00:42:54,631 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-05 00:42:55,051 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-05 00:42:55,052 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-05 00:42:55,057 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:42:55,057 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:55,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:55,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-05 00:42:55,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:55,076 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-05 00:42:55,110 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:42:55,113 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-05 00:42:55,113 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-05 00:42:55,113 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-05 00:42:55,113 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-05 00:42:55,113 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-05 00:42:55,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:42:55,261 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:42:55,305 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:42:55,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:42:55,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:42:55,353 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:42:55,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c64ff40> has no local changes
2025-01-05 00:42:55,361 [ 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.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:42:55,370 [ scc.git] DEBUG [detached HEAD 789dba7] merge master -Dorg -Ssuccess-only
2025-01-05 00:42:55,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:42:55,371 [ scc.git] INFO Overriding base-branch from master to main
2025-01-05 00:42:55,371 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:42:55,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-05 00:42:56,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-05 00:42:56,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-05 00:42:57,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-05 00:42:57,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-05 00:42:58,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-05 00:42:58,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-05 00:42:59,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-05 00:42:59,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-05 00:42:59,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-05 00:43:00,437 [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
2025-01-05 00:43:00,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-05 00:43:01,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:43:01,299 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-05 00:43:01,299 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:43:01,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-05 00:43:01,299 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:01,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:01,306 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-05 00:43:01,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:43:01,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-05 00:43:01,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-05 00:43:01,322 [ scc.git] DEBUG Already up to date.
2025-01-05 00:43:01,323 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-05 00:43:01,719 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-05 00:43:01,719 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-05 00:43:01,724 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:43:01,724 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:01,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:01,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-05 00:43:01,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:01,745 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-05 00:43:01,802 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-05 00:43:01,803 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-05 00:43:01,803 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:43:01,803 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:43:01,810 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-05 00:43:01,817 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-05 00:43:01,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:01,989 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-05 00:43:01,995 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-05 00:43:02,000 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-05 00:43:02,006 [ scc.config] DEBUG Found github.token
2025-01-05 00:43:02,007 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-05 00:43:02,007 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:43:02,050 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:02,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:02,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c5b44f0> has no local changes
2025-01-05 00:43:02,108 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:02,117 [ scc.git] DEBUG [detached HEAD 9c809c3] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:02,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:02,118 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:43:02,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-05 00:43:02,408 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:43:02,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-05 00:43:02,408 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:43:02,418 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:43:02,419 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:43:02,424 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:43:02,429 [ scc.git] DEBUG Already up to date.
2025-01-05 00:43:02,429 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:43:02,429 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:43:02,473 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:02,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:02,523 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c649760> has no local changes
2025-01-05 00:43:02,524 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:02,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:02,532 [ scc.git] DEBUG [detached HEAD 76150ae] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:02,532 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:43:02,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-05 00:43:02,825 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:43:02,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-05 00:43:02,825 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,831 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:43:02,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:43:02,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:43:02,843 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:43:02,849 [ scc.git] DEBUG Already up to date.
2025-01-05 00:43:02,849 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:43:02,849 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,855 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:43:02,899 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:02,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:02,905 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:02,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:02,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c5c5bb0> has no local changes
2025-01-05 00:43:02,956 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:02,966 [ scc.git] DEBUG [detached HEAD 9d9344b] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:02,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:02,966 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:43:03,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-05 00:43:03,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-05 00:43:04,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-05 00:43:04,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-05 00:43:05,231 [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
2025-01-05 00:43:05,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-05 00:43:06,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:43:06,222 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-05 00:43:06,223 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:43:06,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-05 00:43:06,223 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:06,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:06,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-05 00:43:06,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:43:06,236 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-05 00:43:06,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-05 00:43:06,252 [ scc.git] DEBUG Already up to date.
2025-01-05 00:43:06,252 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-05 00:43:06,595 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-05 00:43:06,595 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-05 00:43:06,600 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:43:06,600 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:06,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:06,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-05 00:43:06,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:06,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-05 00:43:06,660 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-05 00:43:06,660 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-05 00:43:06,660 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:43:06,661 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:43:06,668 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-05 00:43:06,676 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-05 00:43:06,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:06,821 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-05 00:43:06,829 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-05 00:43:06,836 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-05 00:43:06,842 [ scc.config] DEBUG Found github.token
2025-01-05 00:43:06,843 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-05 00:43:06,843 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:43:06,891 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:06,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:06,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:06,944 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:06,952 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c56da30> has no local changes
2025-01-05 00:43:06,952 [ 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:06,963 [ scc.git] DEBUG [detached HEAD 33733cc] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:06,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:06,964 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-05 00:43:06,964 [ scc.repo] DEBUG ## PRs found:
2025-01-05 00:43:07,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-05 00:43:07,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-05 00:43:08,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-05 00:43:08,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-05 00:43:09,179 [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
2025-01-05 00:43:09,628 [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
2025-01-05 00:43:10,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-05 00:43:10,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:43:10,484 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-05 00:43:10,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-05 00:43:11,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-05 00:43:11,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-05 00:43:12,337 [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
2025-01-05 00:43:12,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-05 00:43:13,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-05 00:43:13,205 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-05 00:43:13,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-05 00:43:14,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-05 00:43:14,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-05 00:43:15,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-05 00:43:15,165 [ scc.repo] DEBUG ## Branches found:
2025-01-05 00:43:15,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-05 00:43:15,165 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:15,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:15,172 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-05 00:43:15,177 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-05 00:43:15,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-05 00:43:15,185 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-05 00:43:15,192 [ scc.git] DEBUG Already up to date.
2025-01-05 00:43:15,192 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-05 00:43:15,692 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-05 00:43:15,692 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-05 00:43:15,696 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-05 00:43:16,057 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-05 00:43:16,057 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-05 00:43:16,061 [ scc.git] DEBUG ## Unique users: []
2025-01-05 00:43:16,061 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:16,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:16,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-05 00:43:16,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:16,080 [ 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'
2025-01-05 00:43:16,128 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-05 00:43:16,128 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-05 00:43:16,129 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-05 00:43:16,135 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-05 00:43:16,142 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-05 00:43:16,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:16,280 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-05 00:43:16,289 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-05 00:43:16,298 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#297](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-05 00:43:16,311 [ scc.config] DEBUG Found github.token
2025-01-05 00:43:16,312 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-05 00:43:16,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-05 00:43:16,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:16,327 [ 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'
2025-01-05 00:43:16,339 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-05 00:43:16,341 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-05 00:43:16,341 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-05 00:43:16,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:16,694 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-05 00:43:16,740 [ scc.git] DEBUG Get sha1 of %s
2025-01-05 00:43:16,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-05 00:43:16,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:16,797 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:16,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228c56d670> has no local changes
2025-01-05 00:43:16,805 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:16,815 [ scc.git] DEBUG [detached HEAD 5c36edb] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:16,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:16,816 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-05 00:43:16,899 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-05 00:43:17,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:17,095 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-05 00:43:17,100 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-05 00:43:17,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:17,485 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-05 00:43:17,490 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-05 00:43:17,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:17,866 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-05 00:43:17,871 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-05 00:43:18,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:18,260 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-05 00:43:18,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:18,638 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-05 00:43:18,643 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-05 00:43:19,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:19,021 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-05 00:43:19,027 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-05 00:43:19,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:19,408 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-05 00:43:19,415 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-05 00:43:19,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:19,799 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-05 00:43:19,805 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-05 00:43:20,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:20,186 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-05 00:43:20,192 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-05 00:43:20,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:20,567 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-05 00:43:20,573 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-05 00:43:20,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:20,952 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-05 00:43:20,958 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-05 00:43:21,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:21,341 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-05 00:43:21,347 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-05 00:43:21,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:21,779 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-05 00:43:22,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:22,170 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-05 00:43:22,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:22,549 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-05 00:43:22,554 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-05 00:43:22,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:22,954 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-05 00:43:23,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:23,329 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-05 00:43:23,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:23,733 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-05 00:43:23,740 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-05 00:43:24,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:24,113 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-05 00:43:24,121 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-05 00:43:24,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:24,614 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-05 00:43:24,618 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-05 00:43:25,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:25,020 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-05 00:43:25,027 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-05 00:43:25,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-05 00:43:25,402 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-05 00:43:25,403 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-05 00:43:25,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f228dfb7be0> has local changes
2025-01-05 00:43:25,495 [ 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 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
Repository: ome/minimal-omero-client
Already up to date.
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.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (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 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- 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 499 dependabot[bot] 'Bump nanoid and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- 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.
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 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
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
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
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.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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 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#297 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/297/)'
2025-01-05 00:43:25,512 [ scc.git] DEBUG [detached HEAD e472378] merge master -Dorg -Ssuccess-only
2025-01-05 00:43:25,512 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-05 00:43:25,512 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-05 00:43:25,512 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,512 [ scc.merge] INFO
2025-01-05 00:43:25,512 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,512 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-05 00:43:25,512 [ scc.merge] INFO
2025-01-05 00:43:25,512 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-05 00:43:25,512 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-05 00:43:25,513 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,513 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-05 00:43:25,513 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-05 00:43:25,513 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,513 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-05 00:43:25,513 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,513 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-05 00:43:25,513 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,513 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-05 00:43:25,513 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,513 [ scc.merge] INFO
2025-01-05 00:43:25,513 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,514 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,514 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-05 00:43:25,514 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-05 00:43:25,514 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,514 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-05 00:43:25,514 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,514 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,514 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-05 00:43:25,514 [ scc.merge] INFO
2025-01-05 00:43:25,515 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-05 00:43:25,515 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,515 [ scc.merge] INFO
2025-01-05 00:43:25,515 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-05 00:43:25,515 [ scc.merge] INFO
2025-01-05 00:43:25,515 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-05 00:43:25,515 [ scc.merge] INFO
2025-01-05 00:43:25,515 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-05 00:43:25,515 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-05 00:43:25,515 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,515 [ scc.merge] INFO
2025-01-05 00:43:25,515 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,515 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-05 00:43:25,516 [ scc.merge] INFO
2025-01-05 00:43:25,516 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-05 00:43:25,516 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-05 00:43:25,516 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,516 [ scc.merge] INFO
2025-01-05 00:43:25,516 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-05 00:43:25,516 [ scc.merge] INFO
2025-01-05 00:43:25,516 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-05 00:43:25,516 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,516 [ scc.merge] INFO
2025-01-05 00:43:25,516 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-05 00:43:25,516 [ scc.merge] INFO
2025-01-05 00:43:25,516 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-05 00:43:25,516 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,516 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-05 00:43:25,517 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-05 00:43:25,517 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-05 00:43:25,517 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-05 00:43:25,517 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-05 00:43:25,517 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-05 00:43:25,517 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,517 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-05 00:43:25,517 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,517 [ scc.merge] INFO
2025-01-05 00:43:25,517 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,517 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-05 00:43:25,518 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,518 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-05 00:43:25,518 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-05 00:43:25,518 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-05 00:43:25,518 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,518 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-05 00:43:25,518 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-05 00:43:25,518 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,518 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-05 00:43:25,518 [ scc.merge] INFO
2025-01-05 00:43:25,518 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-05 00:43:25,519 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,519 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-05 00:43:25,519 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-05 00:43:25,519 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,519 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-05 00:43:25,519 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-05 00:43:25,519 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-05 00:43:25,519 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,519 [ scc.merge] INFO
2025-01-05 00:43:25,519 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,519 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-05 00:43:25,520 [ scc.merge] INFO
2025-01-05 00:43:25,520 [ scc.merge] INFO Repository: ome/scripts
2025-01-05 00:43:25,520 [ scc.merge] INFO Excluded PRs:
2025-01-05 00:43:25,520 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-05 00:43:25,520 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-05 00:43:25,520 [ scc.merge] INFO Already up to date.
2025-01-05 00:43:25,520 [ scc.merge] INFO
2025-01-05 00:43:25,520 [ scc.merge] INFO Merged PRs:
2025-01-05 00:43:25,520 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-05 00:43:25,520 [ scc.merge] INFO
2025-01-05 00:43:25,520 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-05 00:43:25,520 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-05 00:43:25,520 [ scc.merge] INFO
2025-01-05 00:43:25,520 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-05 00:43:25,520 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-05 00:43:25,528 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-05 00:43:25,534 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-05 00:43:25,540 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-05 00:43:25,547 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-05 00:43:25,553 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-05 00:43:25,560 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-05 00:43:25,566 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-05 00:43:25,573 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-05 00:43:25,580 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-05 00:43:25,587 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-05 00:43:25,595 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-05 00:43:25,602 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-05 00:43:25,610 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-05 00:43:25,617 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-05 00:43:25,625 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-05 00:43:25,634 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-05 00:43:25,639 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-05 00:43:25,646 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-05 00:43:25,652 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-05 00:43:25,658 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-05 00:43:25,663 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-05 00:43:25,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-05 00:43:25,669 [ scc.git] DEBUG Calling 'git remote'
2025-01-05 00:43:25,675 [ 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.10.0 to 5.10.1-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 d0db9fe] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
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 fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
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 100f6ae
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 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 7d76711] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-05 00:44:11,811 [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
2025-01-05 00:44:20,720 [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
2025-01-05 00:44:23,054 [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
2025-01-05 00:44:27,579 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-05 00:45:05,697 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/695419c3/images/svgs/logo.svg){kind=logo}
