Skipping 113 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-12-19 00:44:34,670 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:44:34,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:34,676 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:44:34,716 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:44:34,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6d981b20> has no local changes
2024-12-19 00:44:34,728 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:44:34,740 [ scc.git] DEBUG [detached HEAD bc309d46] merge master -Dorg -Ssuccess-only
2024-12-19 00:44:34,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:44:34,741 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:44:35,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-12-19 00:44:35,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-12-19 00:44:36,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-12-19 00:44:36,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-19 00:44:37,122 [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
2024-12-19 00:44:37,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-19 00:44:38,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:38,079 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-12-19 00:44:38,079 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:44:38,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-19 00:44:38,080 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:44:38,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:38,086 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:44:38,092 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:44:38,092 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:44:38,099 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:44:38,106 [ scc.git] DEBUG Already up to date.
2024-12-19 00:44:38,107 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-19 00:44:38,438 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-19 00:44:38,439 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-12-19 00:44:38,445 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:44:38,445 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:44:38,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:38,452 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-19 00:44:38,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:38,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-19 00:44:38,476 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-19 00:44:38,477 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:44:38,480 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-12-19 00:44:38,480 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-19 00:44:38,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:44:38,641 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:44:38,683 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:44:38,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:38,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:44:38,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:44:38,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6d9c7e50> has no local changes
2024-12-19 00:44:38,745 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:44:38,755 [ scc.git] DEBUG [detached HEAD a33bdaa] merge master -Dorg -Ssuccess-only
2024-12-19 00:44:38,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:44:38,756 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:44:39,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-19 00:44:39,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-19 00:44:40,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-19 00:44:40,183 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:40,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-19 00:44:41,357 [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
2024-12-19 00:44:41,838 [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
2024-12-19 00:44:42,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-19 00:44:42,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:42,892 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-19 00:44:43,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-19 00:44:43,364 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:43,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-19 00:44:44,457 [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
2024-12-19 00:44:44,973 [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
2024-12-19 00:44:45,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-19 00:44:45,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:45,827 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-19 00:44:46,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-19 00:44:46,308 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:46,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-19 00:44:47,360 [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
2024-12-19 00:44:47,864 [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
2024-12-19 00:44:48,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-19 00:44:48,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:48,782 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-19 00:44:49,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-19 00:44:49,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-19 00:44:49,715 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:50,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-19 00:44:50,835 [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
2024-12-19 00:44:51,410 [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
2024-12-19 00:44:52,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-19 00:44:52,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:52,437 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-19 00:44:52,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-19 00:44:52,936 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:53,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-19 00:44:54,052 [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
2024-12-19 00:44:54,614 [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
2024-12-19 00:44:55,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-19 00:44:55,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:55,634 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-19 00:44:56,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-19 00:44:56,110 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:44:56,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-19 00:44:57,177 [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
2024-12-19 00:44:57,728 [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
2024-12-19 00:44:58,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-19 00:44:58,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:44:58,708 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-19 00:44:58,708 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:44:58,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-19 00:44:58,708 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:44:58,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:44:58,714 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:44:58,721 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:44:58,721 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:44:58,728 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:44:58,735 [ scc.git] DEBUG Already up to date.
2024-12-19 00:44:58,735 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-19 00:44:59,042 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:44:59,042 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-19 00:44:59,047 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-19 00:44:59,391 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:44:59,391 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-19 00:44:59,396 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-19 00:44:59,700 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:44:59,700 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-19 00:44:59,706 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-19 00:45:00,001 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:45:00,001 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-19 00:45:00,006 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-19 00:45:00,298 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:45:00,298 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-19 00:45:00,305 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-19 00:45:00,595 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-19 00:45:00,595 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-19 00:45:00,601 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:00,601 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:00,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:00,609 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-19 00:45:00,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:00,623 [ 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'
2024-12-19 00:45:00,636 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:00,642 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-19 00:45:00,642 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-19 00:45:00,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:00,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-19 00:45:00,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:00,801 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-19 00:45:00,824 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-19 00:45:00,824 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:00,830 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-19 00:45:00,830 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-19 00:45:01,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:01,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-19 00:45:01,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:01,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-19 00:45:01,362 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-19 00:45:01,362 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-19 00:45:01,362 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:45:01,362 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:45:01,370 [ scc.git] DEBUG Calling 'git reset --hard cf8582c12623edcebb8f852780877c523b644a9e'
2024-12-19 00:45:01,379 [ scc.git] DEBUG HEAD is now at cf8582c merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-19 00:45:01,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:01,579 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-19 00:45:01,586 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-19 00:45:01,593 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/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
2024-12-19 00:45:01,598 [ scc.config] DEBUG Found github.token
2024-12-19 00:45:01,599 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-19 00:45:01,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-19 00:45:01,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:01,610 [ 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'
2024-12-19 00:45:01,685 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-19 00:45:01,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:01,691 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-19 00:45:01,691 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-19 00:45:01,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:01,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-19 00:45:01,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:01,985 [ 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'
2024-12-19 00:45:02,021 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-19 00:45:02,021 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:02,027 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-19 00:45:02,027 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-19 00:45:02,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:02,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-19 00:45:02,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:02,379 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-19 00:45:02,401 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-19 00:45:02,401 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-19 00:45:02,401 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:45:02,402 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:45:02,409 [ scc.git] DEBUG Calling 'git reset --hard 378f8f360361888f664ec0d1585456acedcaa745'
2024-12-19 00:45:02,417 [ scc.git] DEBUG HEAD is now at 378f8f3 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-19 00:45:02,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:02,762 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-19 00:45:02,769 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-19 00:45:02,779 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/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
2024-12-19 00:45:02,785 [ scc.config] DEBUG Found github.token
2024-12-19 00:45:02,785 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-19 00:45:03,564 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-19 00:45:03,566 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:03,614 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:03,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:03,621 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:03,670 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:03,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6d9c9f40> has no local changes
2024-12-19 00:45:03,680 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:03,691 [ scc.git] DEBUG [detached HEAD 212aa69] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:03,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:03,691 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:04,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-19 00:45:04,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-19 00:45:04,634 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-19 00:45:05,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-19 00:45:05,701 [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
2024-12-19 00:45:06,260 [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
2024-12-19 00:45:06,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-19 00:45:07,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:07,296 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-19 00:45:07,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-19 00:45:08,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-19 00:45:08,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-19 00:45:09,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-19 00:45:09,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-19 00:45:10,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:10,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-19 00:45:11,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-19 00:45:11,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:11,768 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-19 00:45:12,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-19 00:45:12,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-19 00:45:13,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-19 00:45:13,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:14,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-19 00:45:14,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-19 00:45:15,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:15,260 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-19 00:45:15,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-19 00:45:16,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-19 00:45:16,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-19 00:45:17,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:17,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-19 00:45:18,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:18,234 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-19 00:45:18,235 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:18,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-19 00:45:18,235 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:18,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:18,241 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:18,246 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:18,246 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:18,252 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:18,258 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:18,258 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-19 00:45:18,621 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-19 00:45:18,621 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-19 00:45:18,626 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-19 00:45:20,301 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-19 00:45:20,301 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-19 00:45:20,307 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-19 00:45:20,703 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-19 00:45:20,703 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-19 00:45:20,709 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-19 00:45:21,001 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-19 00:45:21,001 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2024-12-19 00:45:21,006 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:21,006 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:21,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:21,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-19 00:45:21,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:21,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-19 00:45:21,064 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-19 00:45:21,064 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:21,069 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-19 00:45:21,069 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-19 00:45:21,069 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-19 00:45:21,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:21,212 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-19 00:45:21,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:21,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-19 00:45:21,252 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-19 00:45:21,252 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-19 00:45:21,252 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-19 00:45:21,252 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-19 00:45:21,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:21,258 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-19 00:45:21,258 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-19 00:45:21,258 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-19 00:45:21,258 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-19 00:45:21,258 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-19 00:45:21,258 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-19 00:45:21,258 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-19 00:45:21,258 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-19 00:45:21,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:21,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-19 00:45:21,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:21,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-19 00:45:21,639 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-19 00:45:21,640 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:21,643 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-19 00:45:21,644 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-19 00:45:21,644 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-19 00:45:21,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:21,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-19 00:45:22,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:22,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-19 00:45:22,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:22,118 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-19 00:45:22,118 [ scc.git] DEBUG package.json | 2 +-
2024-12-19 00:45:22,118 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-19 00:45:22,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:22,386 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:22,429 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:22,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:22,436 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:22,478 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:22,489 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c128610> has no local changes
2024-12-19 00:45:22,489 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:22,503 [ scc.git] DEBUG [detached HEAD b3a5deb] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:22,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:22,504 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:22,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-19 00:45:23,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-19 00:45:23,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-19 00:45:25,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-19 00:45:26,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:26,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-19 00:45:27,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:27,078 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-19 00:45:27,078 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:27,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-19 00:45:27,078 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:27,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:27,085 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:27,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:27,093 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:27,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:27,109 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:27,109 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-19 00:45:27,419 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-19 00:45:27,419 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-19 00:45:27,425 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:27,425 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:27,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:27,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-19 00:45:27,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:27,446 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-19 00:45:27,458 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:27,461 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-19 00:45:27,461 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-19 00:45:27,462 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-19 00:45:27,462 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-19 00:45:27,462 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-19 00:45:27,462 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-19 00:45:27,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:27,598 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:27,648 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:27,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:27,656 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:27,700 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:27,708 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c139bb0> has no local changes
2024-12-19 00:45:27,708 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:27,719 [ scc.git] DEBUG [detached HEAD 1c2dfb0] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:27,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:27,720 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:28,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-19 00:45:28,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-19 00:45:29,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-19 00:45:29,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-19 00:45:30,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:30,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-19 00:45:31,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:31,005 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-19 00:45:31,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-19 00:45:31,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-19 00:45:32,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-19 00:45:32,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:33,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-19 00:45:33,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:33,807 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-19 00:45:33,807 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:33,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-19 00:45:33,807 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:33,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:33,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:33,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:33,820 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:33,827 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:33,833 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:33,833 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-19 00:45:34,149 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-19 00:45:34,149 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-19 00:45:34,156 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-19 00:45:34,931 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-19 00:45:34,931 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-19 00:45:34,936 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:34,937 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:34,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:34,945 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-19 00:45:34,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:34,962 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-19 00:45:35,120 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-19 00:45:35,120 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-19 00:45:35,120 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-19 00:45:35,120 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-19 00:45:35,120 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:45:35,121 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:45:35,129 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-19 00:45:35,139 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-19 00:45:35,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:35,288 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-19 00:45:35,297 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-19 00:45:35,304 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-12-19 00:45:35,311 [ scc.config] DEBUG Found github.token
2024-12-19 00:45:35,312 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-19 00:45:35,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-19 00:45:35,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:35,329 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-19 00:45:35,551 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-19 00:45:35,551 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-19 00:45:35,551 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-19 00:45:35,551 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:45:35,552 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:45:35,559 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-19 00:45:35,567 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-19 00:45:35,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:35,721 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-19 00:45:35,729 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-19 00:45:35,736 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-19 00:45:35,742 [ scc.config] DEBUG Found github.token
2024-12-19 00:45:35,742 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-19 00:45:35,743 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:35,790 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:35,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:35,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:35,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:35,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c0e1880> has no local changes
2024-12-19 00:45:35,853 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:35,865 [ scc.git] DEBUG [detached HEAD 9d2a772] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:35,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:35,866 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:36,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-19 00:45:36,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-19 00:45:37,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-19 00:45:37,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-19 00:45:38,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-19 00:45:38,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-19 00:45:39,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-19 00:45:39,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-19 00:45:39,750 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:39,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-19 00:45:39,750 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:39,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:39,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:39,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:39,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:39,769 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:39,776 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:39,776 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:39,776 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:39,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:39,782 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:39,826 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:39,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:39,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:39,876 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:39,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c0e1670> has no local changes
2024-12-19 00:45:39,884 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:39,895 [ scc.git] DEBUG [detached HEAD c12406a] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:39,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:39,895 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:40,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2024-12-19 00:45:40,183 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:40,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-19 00:45:40,183 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:40,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:40,189 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:40,194 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:40,194 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:40,200 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:40,206 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:40,206 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:40,206 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:40,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:40,211 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:40,256 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:40,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:40,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:40,303 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:40,309 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c146cd0> has no local changes
2024-12-19 00:45:40,310 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:40,318 [ scc.git] DEBUG [detached HEAD 3294a1c] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:40,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:40,319 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:40,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-19 00:45:41,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-19 00:45:41,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-19 00:45:42,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-19 00:45:42,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-19 00:45:43,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:43,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-19 00:45:44,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:44,044 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-19 00:45:44,045 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:44,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-19 00:45:44,045 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:44,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:44,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:44,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:44,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:44,065 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:44,071 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:44,071 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-19 00:45:44,496 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-19 00:45:44,496 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-19 00:45:44,500 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:44,500 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:44,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:44,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-19 00:45:44,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:44,517 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-19 00:45:44,527 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-19 00:45:44,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:44,530 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-19 00:45:44,530 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-19 00:45:44,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:44,668 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:44,714 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:44,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:44,720 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:44,765 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:44,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c10e730> has no local changes
2024-12-19 00:45:44,773 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:44,788 [ scc.git] DEBUG [detached HEAD d1c5ef1] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:44,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:44,788 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:45,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-19 00:45:45,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-19 00:45:46,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-19 00:45:46,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-19 00:45:47,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:47,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-19 00:45:48,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:48,066 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-19 00:45:48,066 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:48,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-19 00:45:48,066 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:48,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:48,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:48,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:48,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:48,084 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:48,090 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:48,090 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-19 00:45:48,449 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-19 00:45:48,450 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-19 00:45:48,454 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:48,454 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:48,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:48,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-19 00:45:48,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:48,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-19 00:45:48,644 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG Auto-merging setup.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-19 00:45:48,644 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:45:48,644 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:45:48,651 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-19 00:45:48,658 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2024-12-19 00:45:48,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:48,790 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-19 00:45:48,796 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-19 00:45:48,802 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2024-12-19 00:45:48,807 [ scc.config] DEBUG Found github.token
2024-12-19 00:45:48,807 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-19 00:45:48,807 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:48,846 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:48,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:48,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:48,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:48,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c10e610> has no local changes
2024-12-19 00:45:48,904 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:48,913 [ scc.git] DEBUG [detached HEAD 17f34fe] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:48,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:48,913 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:49,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-19 00:45:49,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-19 00:45:50,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-19 00:45:50,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-19 00:45:51,282 [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
2024-12-19 00:45:51,729 [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
2024-12-19 00:45:52,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-19 00:45:52,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-19 00:45:53,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-19 00:45:53,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-19 00:45:54,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-19 00:45:54,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:45:55,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-19 00:45:55,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:45:55,556 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-19 00:45:55,556 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:55,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-19 00:45:55,557 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:55,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:55,563 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:55,569 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:55,569 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:55,574 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:55,580 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:55,580 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-19 00:45:55,971 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-19 00:45:55,971 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-19 00:45:55,976 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:55,976 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:55,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:55,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-19 00:45:55,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:55,995 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-19 00:45:56,008 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-19 00:45:56,012 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-19 00:45:56,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-19 00:45:56,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-19 00:45:56,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-19 00:45:56,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-19 00:45:56,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-19 00:45:56,015 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-19 00:45:56,015 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-19 00:45:56,015 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-19 00:45:56,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:45:56,154 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:56,196 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:56,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:56,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:56,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:56,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c0e6c70> has no local changes
2024-12-19 00:45:56,251 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:56,261 [ scc.git] DEBUG [detached HEAD ec772b3] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:56,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:56,261 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:56,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-19 00:45:56,589 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:45:56,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-19 00:45:56,589 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:56,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:56,595 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:45:56,600 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:45:56,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:45:56,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:45:56,612 [ scc.git] DEBUG Already up to date.
2024-12-19 00:45:56,613 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:45:56,613 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:56,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:56,619 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:45:56,661 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:45:56,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:45:56,667 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:45:56,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:45:56,716 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c1387c0> has no local changes
2024-12-19 00:45:56,716 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:45:56,724 [ scc.git] DEBUG [detached HEAD b62fda9] merge master -Dorg -Ssuccess-only
2024-12-19 00:45:56,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:45:56,725 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:45:57,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-19 00:45:57,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-19 00:45:58,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2024-12-19 00:45:58,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-19 00:45:59,184 [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
2024-12-19 00:45:59,637 [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
2024-12-19 00:46:00,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-19 00:46:00,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:46:00,502 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-19 00:46:00,502 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:00,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-19 00:46:00,502 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:00,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:00,508 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:46:00,513 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:00,513 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:46:00,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:46:00,523 [ scc.git] DEBUG Already up to date.
2024-12-19 00:46:00,524 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-19 00:46:00,917 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-19 00:46:00,917 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-19 00:46:00,922 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:00,922 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:00,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:00,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-19 00:46:00,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:00,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-19 00:46:00,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:46:00,952 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-19 00:46:00,952 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-19 00:46:00,952 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-19 00:46:00,952 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-19 00:46:00,952 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-19 00:46:01,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:01,120 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:01,159 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:01,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:01,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:01,200 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:01,205 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c06efd0> has no local changes
2024-12-19 00:46:01,206 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:01,213 [ scc.git] DEBUG [detached HEAD 25063e5] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:01,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:01,214 [ scc.git] INFO Overriding base-branch from master to main
2024-12-19 00:46:01,214 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:46:01,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-19 00:46:02,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-19 00:46:02,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-19 00:46:03,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-19 00:46:03,732 [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
2024-12-19 00:46:04,176 [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
2024-12-19 00:46:04,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-19 00:46:05,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-19 00:46:05,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-19 00:46:06,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-19 00:46:06,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:46:07,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-19 00:46:07,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:46:07,537 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-19 00:46:07,537 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:07,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-19 00:46:07,537 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:07,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:07,543 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-19 00:46:07,549 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:07,549 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-19 00:46:07,556 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-19 00:46:07,563 [ scc.git] DEBUG Already up to date.
2024-12-19 00:46:07,563 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-19 00:46:07,969 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-19 00:46:07,969 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-19 00:46:07,974 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:07,974 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:07,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:07,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-19 00:46:07,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:07,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-19 00:46:08,060 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-19 00:46:08,060 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-19 00:46:08,060 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:46:08,060 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:46:08,067 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-19 00:46:08,075 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2024-12-19 00:46:08,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:08,228 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-19 00:46:08,235 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-19 00:46:08,241 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-19 00:46:08,247 [ scc.config] DEBUG Found github.token
2024-12-19 00:46:08,247 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-19 00:46:08,247 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:08,289 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:08,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:08,296 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:08,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:08,346 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c06e4c0> has no local changes
2024-12-19 00:46:08,346 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:08,355 [ scc.git] DEBUG [detached HEAD bcf365b] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:08,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:08,356 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:46:08,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-19 00:46:08,659 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:08,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-19 00:46:08,659 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:08,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:08,665 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:46:08,671 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:08,671 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:46:08,677 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:46:08,682 [ scc.git] DEBUG Already up to date.
2024-12-19 00:46:08,682 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:08,682 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:08,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:08,688 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:08,730 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:08,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:08,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:08,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:08,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c07fc10> has no local changes
2024-12-19 00:46:08,786 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:08,795 [ scc.git] DEBUG [detached HEAD 4130e70] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:08,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:08,795 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:46:09,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-19 00:46:09,076 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:09,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-19 00:46:09,076 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:09,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:09,083 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:46:09,088 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:09,088 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:46:09,093 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:46:09,099 [ scc.git] DEBUG Already up to date.
2024-12-19 00:46:09,099 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:09,099 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:09,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:09,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:09,144 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:09,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:09,150 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:09,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:09,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c077970> has no local changes
2024-12-19 00:46:09,197 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:09,206 [ scc.git] DEBUG [detached HEAD e3dd28e] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:09,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:09,206 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:46:09,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-19 00:46:10,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-19 00:46:10,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-19 00:46:11,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-19 00:46:11,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:46:12,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-19 00:46:12,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:46:12,477 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-19 00:46:12,477 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:12,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-19 00:46:12,477 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:12,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:12,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-19 00:46:12,489 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:12,489 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-19 00:46:12,494 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-19 00:46:12,500 [ scc.git] DEBUG Already up to date.
2024-12-19 00:46:12,500 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-19 00:46:12,837 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-19 00:46:12,838 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-19 00:46:12,842 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:12,842 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:12,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:12,848 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-19 00:46:12,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:12,860 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-19 00:46:12,961 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-19 00:46:12,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-19 00:46:12,961 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:46:12,962 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:46:12,970 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-19 00:46:12,978 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-19 00:46:13,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:13,116 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-19 00:46:13,123 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-19 00:46:13,129 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-19 00:46:13,134 [ scc.config] DEBUG Found github.token
2024-12-19 00:46:13,134 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-19 00:46:13,135 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:13,175 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:13,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:13,182 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:13,223 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:13,230 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c0775e0> has no local changes
2024-12-19 00:46:13,231 [ 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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:13,240 [ scc.git] DEBUG [detached HEAD 865d734] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:13,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:13,241 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-19 00:46:13,241 [ scc.repo] DEBUG ## PRs found:
2024-12-19 00:46:13,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-19 00:46:14,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-19 00:46:14,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-19 00:46:15,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-19 00:46:15,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:46:15,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-19 00:46:16,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-19 00:46:16,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:46:16,855 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-19 00:46:17,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-19 00:46:17,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-19 00:46:18,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-19 00:46:18,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-19 00:46:19,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-19 00:46:19,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-19 00:46:19,694 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-19 00:46:20,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-19 00:46:20,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-19 00:46:21,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-19 00:46:21,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-19 00:46:21,739 [ scc.repo] DEBUG ## Branches found:
2024-12-19 00:46:21,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-19 00:46:21,739 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:21,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:21,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-19 00:46:21,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-19 00:46:21,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-19 00:46:21,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-19 00:46:21,787 [ scc.git] DEBUG Updating 312afbe..4b4c755
2024-12-19 00:46:22,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/216 HTTP/1.1" 200 None
2024-12-19 00:46:22,398 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-19 00:46:22,793 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-19 00:46:22,793 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-19 00:46:22,798 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-19 00:46:23,146 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-19 00:46:23,146 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-19 00:46:23,151 [ scc.git] DEBUG ## Unique users: []
2024-12-19 00:46:23,151 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:23,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:23,157 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-19 00:46:23,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:23,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-19 00:46:23,281 [ 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.
2024-12-19 00:46:23,281 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-19 00:46:23,282 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-19 00:46:23,288 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-19 00:46:23,294 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2024-12-19 00:46:23,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:23,445 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-19 00:46:23,453 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2024-12-19 00:46:23,460 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#283](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-19 00:46:23,464 [ scc.config] DEBUG Found github.token
2024-12-19 00:46:23,465 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-19 00:46:23,465 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-19 00:46:23,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:23,476 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-19 00:46:23,487 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-19 00:46:23,489 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-19 00:46:23,489 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-19 00:46:23,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:23,830 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-19 00:46:23,869 [ scc.git] DEBUG Get sha1 of %s
2024-12-19 00:46:23,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-19 00:46:23,875 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:23,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:23,918 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee6c0d8f40> has no local changes
2024-12-19 00:46:23,919 [ 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)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:23,927 [ scc.git] DEBUG [detached HEAD 79fe789] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:23,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:23,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-19 00:46:24,000 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-19 00:46:24,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:24,229 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-19 00:46:24,233 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-19 00:46:24,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:24,631 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-19 00:46:24,635 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-19 00:46:25,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:25,032 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-19 00:46:25,037 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-19 00:46:25,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:25,430 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-19 00:46:25,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:25,803 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-19 00:46:25,810 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-19 00:46:26,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:26,189 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-19 00:46:26,195 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-19 00:46:26,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:26,575 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-19 00:46:26,580 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-19 00:46:26,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:26,960 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-19 00:46:26,966 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-19 00:46:27,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:27,357 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-19 00:46:27,363 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-19 00:46:27,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:27,746 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-19 00:46:27,751 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-19 00:46:28,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:28,130 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-19 00:46:28,135 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-19 00:46:28,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:28,515 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-19 00:46:28,520 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-19 00:46:28,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:28,916 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-19 00:46:29,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:29,307 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-19 00:46:29,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:29,702 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-19 00:46:29,707 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-19 00:46:30,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:30,098 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-19 00:46:30,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:30,487 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-19 00:46:30,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:30,873 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-19 00:46:30,878 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-19 00:46:31,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:31,264 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-19 00:46:31,269 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-19 00:46:31,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:31,663 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-19 00:46:31,669 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-19 00:46:32,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:32,041 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-19 00:46:32,046 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-19 00:46:32,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-19 00:46:32,432 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-19 00:46:32,432 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-19 00:46:32,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fee70defe20> has local changes
2024-12-19 00:46:32,521 [ 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 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
- PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
- PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
- PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
- PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
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
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
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)
Updating 312afbe..4b4c755
Previously merged:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement'
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#283 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/283/)'
2024-12-19 00:46:32,537 [ scc.git] DEBUG [detached HEAD ba5e92a] merge master -Dorg -Ssuccess-only
2024-12-19 00:46:32,537 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-19 00:46:32,537 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-19 00:46:32,537 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,537 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 425 dependabot[bot] 'Bump omero-rois from `5c752d5` to `7c7ed9a`'
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 426 dependabot[bot] 'Bump omero-prometheus-tools from `18bccb6` to `eb47378`'
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 427 dependabot[bot] 'Bump omero-web-zarr from `67bb245` to `8f3c313`'
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-19 00:46:32,538 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-19 00:46:32,538 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-19 00:46:32,538 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-19 00:46:32,538 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-19 00:46:32,538 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-19 00:46:32,538 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-19 00:46:32,538 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,538 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-19 00:46:32,538 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-19 00:46:32,538 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-19 00:46:32,539 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-19 00:46:32,539 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-19 00:46:32,539 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-19 00:46:32,539 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-19 00:46:32,539 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-19 00:46:32,539 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,539 [ scc.merge] INFO
2024-12-19 00:46:32,539 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-19 00:46:32,539 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-19 00:46:32,540 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-19 00:46:32,540 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-19 00:46:32,540 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-19 00:46:32,540 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-19 00:46:32,540 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-19 00:46:32,540 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-19 00:46:32,540 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-19 00:46:32,540 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,540 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,540 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-19 00:46:32,540 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-19 00:46:32,541 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-19 00:46:32,541 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,541 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-19 00:46:32,541 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,541 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-19 00:46:32,542 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-19 00:46:32,542 [ scc.merge] INFO Already up to date.
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Repository: ome/scripts
2024-12-19 00:46:32,542 [ scc.merge] INFO Excluded PRs:
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-19 00:46:32,542 [ scc.merge] INFO Updating 312afbe..4b4c755
2024-12-19 00:46:32,542 [ scc.merge] INFO Previously merged:
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement'
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Merged PRs:
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-19 00:46:32,542 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-19 00:46:32,542 [ scc.merge] INFO
2024-12-19 00:46:32,542 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-19 00:46:32,542 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-19 00:46:32,548 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-19 00:46:32,555 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-19 00:46:32,561 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-19 00:46:32,567 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-19 00:46:32,574 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-19 00:46:32,579 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-19 00:46:32,585 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-19 00:46:32,591 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-19 00:46:32,597 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-19 00:46:32,602 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-19 00:46:32,607 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-19 00:46:32,612 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-19 00:46:32,617 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-19 00:46:32,622 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-19 00:46:32,627 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-19 00:46:32,632 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-19 00:46:32,637 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-19 00:46:32,642 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-19 00:46:32,647 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-19 00:46:32,652 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-19 00:46:32,657 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-19 00:46:32,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-19 00:46:32,662 [ scc.git] DEBUG Calling 'git remote'
2024-12-19 00:46:32,666 [ 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 2662287] 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 7c7ed9a
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 312afbe
nothing to commit, working tree clean
[detached HEAD 5b0f152] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-19 00:47:20,582 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-19 00:47:29,695 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-19 00:47:32,077 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-19 00:47:36,735 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-19 00:48:17,299 [ 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/4f42acd4/images/svgs/logo.svg){kind=logo}
