Skipping 97 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-06 00:44:46,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:44:46,980 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:44:47,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2025-01-06 00:44:47,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2025-01-06 00:44:48,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2025-01-06 00:44:48,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2025-01-06 00:44:48,879 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:44:48,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-06 00:44:48,880 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:48,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:48,886 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:44:48,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:44:48,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:44:48,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:44:48,904 [ scc.git] DEBUG Already up to date.
2025-01-06 00:44:48,904 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:44:48,904 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:48,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:48,910 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:44:48,952 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:48,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:48,958 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:44:48,999 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:44:49,007 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60790580> has no local changes
2025-01-06 00:44:49,007 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:44:49,016 [ scc.git] DEBUG [detached HEAD 7d441e53] merge master -Dorg -Ssuccess-only
2025-01-06 00:44:49,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:44:49,017 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:44:49,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-06 00:44:49,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-06 00:44:50,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-06 00:44:50,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-06 00:44:51,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:44:51,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-06 00:44:52,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:44:52,354 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-06 00:44:52,355 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:44:52,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-06 00:44:52,355 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:52,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:52,362 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:44:52,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:44:52,368 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:44:52,374 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:44:52,380 [ scc.git] DEBUG Already up to date.
2025-01-06 00:44:52,381 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-06 00:44:52,752 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-06 00:44:52,752 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-06 00:44:52,756 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:44:52,757 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:52,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:52,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-06 00:44:52,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:52,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-06 00:44:52,809 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-06 00:44:52,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:44:52,813 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-06 00:44:52,813 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-06 00:44:52,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:44:52,961 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:44:53,006 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:44:53,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:44:53,014 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:44:53,056 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:44:53,064 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b607a59a0> has no local changes
2025-01-06 00:44:53,064 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:44:53,074 [ scc.git] DEBUG [detached HEAD 0aa3534] merge master -Dorg -Ssuccess-only
2025-01-06 00:44:53,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:44:53,074 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:44:53,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-06 00:44:53,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-06 00:44:54,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-06 00:44:55,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-06 00:44:55,016 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:44:55,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-06 00:44:56,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:44:56,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:44:57,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-06 00:44:57,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:44:57,586 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-06 00:44:58,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-06 00:44:58,055 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:44:58,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-06 00:44:59,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:44:59,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:00,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-06 00:45:00,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:00,573 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-06 00:45:01,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-06 00:45:01,102 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:45:01,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-06 00:45:02,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:02,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:03,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-06 00:45:03,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:03,557 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-06 00:45:04,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-06 00:45:04,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-06 00:45:04,463 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:45:05,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-06 00:45:05,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:06,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:06,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-06 00:45:06,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:06,935 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-06 00:45:07,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-06 00:45:07,412 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:45:07,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-06 00:45:08,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:08,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:09,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-06 00:45:09,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:09,947 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-06 00:45:10,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-06 00:45:10,432 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:45:11,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-06 00:45:11,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:12,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:12,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-06 00:45:13,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:13,118 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-06 00:45:13,118 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:13,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-06 00:45:13,119 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:13,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:13,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:13,132 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:13,133 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:13,139 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:13,146 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:13,146 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-06 00:45:13,479 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:13,480 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-06 00:45:13,485 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-06 00:45:13,782 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:13,782 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-06 00:45:13,787 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-06 00:45:14,098 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:14,098 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-06 00:45:14,103 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-06 00:45:14,402 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:14,403 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-06 00:45:14,409 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-06 00:45:14,693 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:14,693 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-06 00:45:14,698 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-06 00:45:15,019 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-06 00:45:15,020 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-06 00:45:15,024 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:15,024 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:15,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:15,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-06 00:45:15,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:15,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-06 00:45:15,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:15,129 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-06 00:45:15,129 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-06 00:45:15,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:15,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-06 00:45:15,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:15,314 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-06 00:45:15,378 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-06 00:45:15,378 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:15,384 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-06 00:45:15,384 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-06 00:45:15,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:15,685 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-06 00:45:15,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:15,701 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-06 00:45:15,739 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-06 00:45:15,739 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-06 00:45:15,739 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:45:15,740 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:45:15,746 [ scc.git] DEBUG Calling 'git reset --hard 8083f138f16600554132bc7d4f316f9b11cff0b2'
2025-01-06 00:45:15,753 [ scc.git] DEBUG HEAD is now at 8083f13 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-06 00:45:16,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:16,074 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-06 00:45:16,081 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-06 00:45:16,087 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-06 00:45:16,093 [ scc.config] DEBUG Found github.token
2025-01-06 00:45:16,093 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-06 00:45:16,093 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-06 00:45:16,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:16,121 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-06 00:45:16,183 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-06 00:45:16,184 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:16,189 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-06 00:45:16,189 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-06 00:45:16,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:16,489 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-06 00:45:16,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:16,518 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-06 00:45:16,578 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-06 00:45:16,579 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:16,583 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-06 00:45:16,584 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-06 00:45:16,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:16,870 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-06 00:45:16,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:16,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-06 00:45:17,016 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-06 00:45:17,016 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-06 00:45:17,016 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:45:17,017 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:45:17,023 [ scc.git] DEBUG Calling 'git reset --hard 9710325b12ee18af6b78a67724a3a59321d8d084'
2025-01-06 00:45:17,033 [ scc.git] DEBUG HEAD is now at 9710325 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-06 00:45:17,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:17,262 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-06 00:45:17,267 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-06 00:45:17,273 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-06 00:45:17,279 [ scc.config] DEBUG Found github.token
2025-01-06 00:45:17,280 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-06 00:45:17,280 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:17,325 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:17,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:17,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:17,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:17,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b607abb20> has no local changes
2025-01-06 00:45:17,380 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:17,390 [ scc.git] DEBUG [detached HEAD 457f192] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:17,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:17,391 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:17,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-06 00:45:18,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-06 00:45:18,230 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-06 00:45:18,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-06 00:45:19,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:19,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:20,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-06 00:45:20,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:20,844 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-06 00:45:21,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-06 00:45:21,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-06 00:45:22,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-06 00:45:22,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-06 00:45:23,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-06 00:45:23,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:24,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:24,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-06 00:45:25,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:25,119 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-06 00:45:25,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-06 00:45:26,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-06 00:45:26,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-06 00:45:27,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:27,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:45:28,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-06 00:45:28,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:28,484 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-06 00:45:28,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-06 00:45:29,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-06 00:45:29,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-06 00:45:30,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:30,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-06 00:45:31,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:31,254 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-06 00:45:31,255 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:31,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-06 00:45:31,255 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:31,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:31,261 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:31,265 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:31,266 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:31,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:31,294 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:31,294 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-06 00:45:32,800 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-06 00:45:32,800 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-06 00:45:32,805 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-06 00:45:33,697 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-06 00:45:33,697 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-06 00:45:33,703 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-06 00:45:34,137 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-06 00:45:34,137 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-06 00:45:34,142 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-06 00:45:34,442 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-06 00:45:34,442 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-06 00:45:34,449 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:34,449 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:34,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:34,457 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-06 00:45:34,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:34,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-06 00:45:34,541 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-06 00:45:34,541 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:34,545 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-06 00:45:34,545 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-06 00:45:34,545 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-06 00:45:34,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:34,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-06 00:45:34,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:34,694 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-06 00:45:35,154 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-06 00:45:35,154 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-06 00:45:35,154 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-06 00:45:35,154 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-06 00:45:35,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:35,160 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-06 00:45:35,160 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-06 00:45:35,160 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-06 00:45:35,160 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-06 00:45:35,160 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-06 00:45:35,160 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-06 00:45:35,160 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-06 00:45:35,160 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-06 00:45:35,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:35,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-06 00:45:35,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:35,345 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-06 00:45:35,405 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-06 00:45:35,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:35,409 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-06 00:45:35,409 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-06 00:45:35,409 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-06 00:45:35,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:35,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-06 00:45:35,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:35,757 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-06 00:45:35,839 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:35,850 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-06 00:45:35,850 [ scc.git] DEBUG package.json | 2 +-
2025-01-06 00:45:35,850 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-06 00:45:36,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:36,116 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:36,162 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:36,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:36,168 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:36,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:36,222 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60780e80> has no local changes
2025-01-06 00:45:36,222 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:36,232 [ scc.git] DEBUG [detached HEAD 86b990d] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:36,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:36,233 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:36,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-06 00:45:37,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-06 00:45:37,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-06 00:45:38,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-06 00:45:38,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:39,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-06 00:45:39,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:39,540 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-06 00:45:39,541 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:39,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-06 00:45:39,541 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:39,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:39,547 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:39,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:39,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:39,561 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:39,568 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:39,568 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-06 00:45:40,251 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-06 00:45:40,252 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-06 00:45:40,256 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:40,257 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:40,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:40,262 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-06 00:45:40,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:40,274 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-06 00:45:40,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:40,288 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-06 00:45:40,288 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-06 00:45:40,288 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-06 00:45:40,288 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-06 00:45:40,289 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-06 00:45:40,289 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-06 00:45:40,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:40,427 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:40,473 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:40,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:40,481 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:40,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:40,534 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6072d5b0> has no local changes
2025-01-06 00:45:40,534 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:40,543 [ scc.git] DEBUG [detached HEAD fcdd521] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:40,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:40,544 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:40,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-06 00:45:41,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-06 00:45:41,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-06 00:45:42,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-06 00:45:42,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:43,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-06 00:45:43,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:43,730 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-06 00:45:44,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-06 00:45:44,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-06 00:45:45,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-06 00:45:45,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:46,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-06 00:45:46,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:46,544 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-06 00:45:46,544 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:46,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-06 00:45:46,544 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:46,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:46,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:46,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:46,555 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:46,560 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:46,565 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:46,566 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-06 00:45:47,522 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-06 00:45:47,523 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-06 00:45:47,528 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-06 00:45:48,273 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-06 00:45:48,273 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-06 00:45:48,279 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:48,279 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:48,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:48,285 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-06 00:45:48,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:48,299 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-06 00:45:48,485 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-06 00:45:48,485 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-06 00:45:48,486 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-06 00:45:48,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-06 00:45:48,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:45:48,487 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:45:48,495 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-06 00:45:48,504 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-06 00:45:48,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:48,677 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-06 00:45:48,685 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-06 00:45:48,739 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-06 00:45:48,746 [ scc.config] DEBUG Found github.token
2025-01-06 00:45:48,746 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-06 00:45:48,746 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-06 00:45:48,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:48,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-06 00:45:48,863 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-06 00:45:48,864 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-06 00:45:48,864 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-06 00:45:48,864 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:45:48,864 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:45:48,871 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-06 00:45:48,879 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-06 00:45:49,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:49,082 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-06 00:45:49,092 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-06 00:45:49,099 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-01-06 00:45:49,104 [ scc.config] DEBUG Found github.token
2025-01-06 00:45:49,104 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-06 00:45:49,104 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:49,151 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:49,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:49,157 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:49,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:49,219 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60740b80> has no local changes
2025-01-06 00:45:49,219 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:49,233 [ scc.git] DEBUG [detached HEAD 3854f85] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:49,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:49,234 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:49,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-06 00:45:50,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-06 00:45:50,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-06 00:45:51,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-06 00:45:51,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-06 00:45:51,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-06 00:45:52,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-06 00:45:52,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-06 00:45:52,996 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:52,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-06 00:45:52,997 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:52,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:53,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:53,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:53,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:53,024 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:53,025 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:53,025 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:53,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,031 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:53,078 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:53,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:53,131 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:53,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6075ff40> has no local changes
2025-01-06 00:45:53,140 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:53,199 [ scc.git] DEBUG [detached HEAD 729e324] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:53,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:53,200 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:53,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-06 00:45:53,376 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:53,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-06 00:45:53,376 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:53,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,383 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:53,389 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:53,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:53,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:53,404 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:53,404 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:53,404 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:53,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,410 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:53,455 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:53,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:53,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:53,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:53,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b606e3940> has no local changes
2025-01-06 00:45:53,513 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:53,523 [ scc.git] DEBUG [detached HEAD af25dda] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:53,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:53,523 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:53,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-01-06 00:45:54,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2025-01-06 00:45:54,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2025-01-06 00:45:55,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-06 00:45:55,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:45:56,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2025-01-06 00:45:56,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:45:56,745 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-06 00:45:56,745 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:45:56,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-06 00:45:56,746 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:56,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:56,753 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:45:56,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:45:56,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:45:56,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:45:56,778 [ scc.git] DEBUG Already up to date.
2025-01-06 00:45:56,779 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2025-01-06 00:45:57,310 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-01-06 00:45:57,310 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2025-01-06 00:45:57,315 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:45:57,315 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:57,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:57,320 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-06 00:45:57,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:57,333 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2025-01-06 00:45:57,345 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2025-01-06 00:45:57,345 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:45:57,348 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2025-01-06 00:45:57,348 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2025-01-06 00:45:57,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:45:57,487 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:45:57,528 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:45:57,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:45:57,534 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:45:57,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:45:57,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6069d5e0> has no local changes
2025-01-06 00:45:57,583 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:45:57,592 [ scc.git] DEBUG [detached HEAD 69353f4] merge master -Dorg -Ssuccess-only
2025-01-06 00:45:57,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:45:57,593 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:45:57,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-06 00:45:58,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-06 00:45:58,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-06 00:45:59,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-06 00:45:59,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:00,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-06 00:46:00,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:00,871 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-06 00:46:00,871 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:00,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-06 00:46:00,871 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:00,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:00,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:00,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:00,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:00,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:00,933 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:00,933 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-06 00:46:01,299 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-06 00:46:01,299 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-06 00:46:01,305 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:01,305 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:01,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:01,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-06 00:46:01,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:01,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-06 00:46:01,375 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG Auto-merging setup.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-06 00:46:01,376 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:46:01,376 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:46:01,382 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-06 00:46:01,388 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-06 00:46:01,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:01,534 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-06 00:46:01,540 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-06 00:46:01,564 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-01-06 00:46:01,569 [ scc.config] DEBUG Found github.token
2025-01-06 00:46:01,569 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-06 00:46:01,569 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:01,609 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:01,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:01,615 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:01,659 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:01,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6069d7f0> has no local changes
2025-01-06 00:46:01,665 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:01,674 [ scc.git] DEBUG [detached HEAD 842147b] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:01,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:01,675 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:02,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-06 00:46:02,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-06 00:46:03,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-06 00:46:03,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-06 00:46:04,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:04,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:46:04,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-06 00:46:05,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-06 00:46:05,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-06 00:46:06,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-06 00:46:06,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-06 00:46:07,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:07,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-06 00:46:08,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:08,168 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-06 00:46:08,168 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:08,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-06 00:46:08,168 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:08,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:08,174 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:08,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:08,180 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:08,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:08,192 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:08,192 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-06 00:46:08,636 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-06 00:46:08,637 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-06 00:46:08,641 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:08,642 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:08,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:08,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-06 00:46:08,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:08,659 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-01-06 00:46:08,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:46:08,739 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-06 00:46:08,739 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-06 00:46:08,739 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-06 00:46:08,739 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-06 00:46:08,739 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-06 00:46:08,740 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-06 00:46:08,742 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-06 00:46:08,742 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-06 00:46:08,742 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-06 00:46:08,742 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-06 00:46:08,742 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-06 00:46:08,742 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-06 00:46:08,742 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-06 00:46:08,743 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-06 00:46:08,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:08,890 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:08,934 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:08,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:08,941 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:08,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:08,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6069d640> has no local changes
2025-01-06 00:46:08,992 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:09,001 [ scc.git] DEBUG [detached HEAD 168cafa] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:09,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:09,002 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:09,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-06 00:46:09,339 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:09,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-06 00:46:09,339 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:09,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:09,345 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:09,351 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:09,351 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:09,357 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:09,363 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:09,364 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:09,364 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:09,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:09,369 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:09,412 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:09,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:09,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:09,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:09,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60706550> has no local changes
2025-01-06 00:46:09,468 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:09,478 [ scc.git] DEBUG [detached HEAD dcd2a97] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:09,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:09,478 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:09,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-06 00:46:10,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-06 00:46:10,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-06 00:46:11,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-06 00:46:11,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:12,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:46:12,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-06 00:46:13,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:13,274 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-06 00:46:13,274 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:13,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-06 00:46:13,275 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:13,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:13,280 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:13,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:13,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:13,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:13,295 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:13,296 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-06 00:46:13,778 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-06 00:46:13,778 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-06 00:46:13,783 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:13,783 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:13,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:13,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-06 00:46:13,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:13,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-06 00:46:13,846 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:46:13,849 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-06 00:46:13,849 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-06 00:46:13,849 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-06 00:46:13,849 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-06 00:46:13,849 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-06 00:46:13,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:13,992 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:14,036 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:14,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:14,042 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:14,086 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:14,094 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60706790> has no local changes
2025-01-06 00:46:14,094 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:14,104 [ scc.git] DEBUG [detached HEAD 7576e5e] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:14,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:14,105 [ scc.git] INFO Overriding base-branch from master to main
2025-01-06 00:46:14,105 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:14,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-06 00:46:15,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-06 00:46:15,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-06 00:46:15,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-06 00:46:16,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:17,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:46:17,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-06 00:46:17,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-06 00:46:18,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-06 00:46:18,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-06 00:46:19,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:19,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-06 00:46:20,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:20,382 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-06 00:46:20,385 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:20,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-06 00:46:20,387 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:20,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:20,397 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-06 00:46:20,404 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:20,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-06 00:46:20,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-06 00:46:20,417 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:20,417 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-06 00:46:20,796 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-06 00:46:20,796 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-06 00:46:20,801 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:20,802 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:20,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:20,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-06 00:46:20,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:20,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-06 00:46:20,871 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-06 00:46:20,871 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-06 00:46:20,871 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:46:20,872 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:46:20,878 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-06 00:46:20,885 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-06 00:46:21,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:21,022 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-06 00:46:21,029 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-06 00:46:21,035 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-06 00:46:21,041 [ scc.config] DEBUG Found github.token
2025-01-06 00:46:21,041 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-06 00:46:21,041 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:21,084 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:21,134 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:21,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b606baf40> has no local changes
2025-01-06 00:46:21,144 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:21,154 [ scc.git] DEBUG [detached HEAD 2726fa5] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:21,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:21,155 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:21,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-06 00:46:21,429 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:21,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-06 00:46:21,429 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,434 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:21,439 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:21,440 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:21,446 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:21,452 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:21,452 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:21,453 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,459 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:21,501 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,506 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:21,545 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:21,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60676580> has no local changes
2025-01-06 00:46:21,552 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:21,560 [ scc.git] DEBUG [detached HEAD c4f8967] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:21,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:21,561 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:21,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-06 00:46:21,866 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:21,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-06 00:46:21,866 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:21,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:21,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:21,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:21,891 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:21,891 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:21,891 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,897 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:21,941 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:21,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:21,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:21,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:21,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b60687b80> has no local changes
2025-01-06 00:46:21,998 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:22,007 [ scc.git] DEBUG [detached HEAD 3668c74] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:22,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:22,008 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:22,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-06 00:46:22,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-06 00:46:23,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-06 00:46:23,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-06 00:46:24,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:24,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-06 00:46:25,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:25,256 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-06 00:46:25,256 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:25,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-06 00:46:25,256 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:25,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:25,262 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-06 00:46:25,268 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:25,268 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-06 00:46:25,274 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-06 00:46:25,281 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:25,281 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-06 00:46:25,685 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-06 00:46:25,685 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-06 00:46:25,690 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:25,690 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:25,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:25,696 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-06 00:46:25,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:25,710 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-06 00:46:25,743 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-06 00:46:25,743 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-06 00:46:25,743 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:46:25,744 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:46:25,751 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-06 00:46:25,759 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-06 00:46:25,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:25,902 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-06 00:46:25,909 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-06 00:46:25,916 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-06 00:46:25,922 [ scc.config] DEBUG Found github.token
2025-01-06 00:46:25,922 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-06 00:46:25,923 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:25,967 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:25,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:25,973 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:26,020 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:26,029 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6062faf0> has no local changes
2025-01-06 00:46:26,029 [ 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#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:26,040 [ scc.git] DEBUG [detached HEAD c9783d0] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:26,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:26,041 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-06 00:46:26,041 [ scc.repo] DEBUG ## PRs found:
2025-01-06 00:46:26,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-06 00:46:26,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-06 00:46:27,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-06 00:46:27,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-06 00:46:28,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:28,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-06 00:46:29,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-06 00:46:29,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:29,743 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-06 00:46:30,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-06 00:46:30,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-06 00:46:31,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-06 00:46:31,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-06 00:46:32,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-06 00:46:32,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-06 00:46:32,500 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-06 00:46:32,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-06 00:46:33,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-06 00:46:33,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-06 00:46:34,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-06 00:46:34,428 [ scc.repo] DEBUG ## Branches found:
2025-01-06 00:46:34,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-06 00:46:34,428 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:34,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:34,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-06 00:46:34,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-06 00:46:34,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-06 00:46:34,448 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-06 00:46:34,456 [ scc.git] DEBUG Already up to date.
2025-01-06 00:46:34,457 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-06 00:46:35,253 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-06 00:46:35,253 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-06 00:46:35,258 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-06 00:46:35,615 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-06 00:46:35,616 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-06 00:46:35,623 [ scc.git] DEBUG ## Unique users: []
2025-01-06 00:46:35,623 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:35,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:35,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-06 00:46:35,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:35,645 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-06 00:46:35,707 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-06 00:46:35,708 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-06 00:46:35,708 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-06 00:46:35,715 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-06 00:46:35,722 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-06 00:46:35,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:35,866 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-06 00:46:35,875 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-06 00:46:35,884 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#298](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-06 00:46:35,891 [ scc.config] DEBUG Found github.token
2025-01-06 00:46:35,891 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-06 00:46:35,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-06 00:46:35,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:35,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-06 00:46:35,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-06 00:46:35,924 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-06 00:46:35,924 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-06 00:46:36,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:36,263 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-06 00:46:36,309 [ scc.git] DEBUG Get sha1 of %s
2025-01-06 00:46:36,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-06 00:46:36,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:36,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:36,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b6062f6a0> has no local changes
2025-01-06 00:46:36,370 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:36,379 [ scc.git] DEBUG [detached HEAD 6e703a9] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:36,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:36,380 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-06 00:46:36,466 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-06 00:46:36,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:36,667 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-06 00:46:36,672 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-06 00:46:37,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:37,059 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-06 00:46:37,065 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-06 00:46:37,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:37,451 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-06 00:46:37,457 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-06 00:46:37,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:37,836 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-06 00:46:38,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:38,217 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-06 00:46:38,222 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-06 00:46:38,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:38,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-06 00:46:38,615 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-06 00:46:38,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:38,998 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-06 00:46:39,002 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-06 00:46:39,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:39,383 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-06 00:46:39,387 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-06 00:46:39,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:39,767 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-06 00:46:39,772 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-06 00:46:40,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:40,182 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-06 00:46:40,191 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-06 00:46:40,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:40,572 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-06 00:46:40,577 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-06 00:46:40,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:40,976 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-06 00:46:40,981 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-06 00:46:41,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:41,363 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-06 00:46:41,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:41,756 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-06 00:46:42,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:42,159 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-06 00:46:42,165 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-06 00:46:42,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:42,549 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-06 00:46:42,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:42,932 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-06 00:46:43,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:43,313 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-06 00:46:43,319 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-06 00:46:43,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:43,709 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-06 00:46:43,715 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-06 00:46:44,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:44,096 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-06 00:46:44,101 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-06 00:46:44,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:44,480 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-06 00:46:44,484 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-06 00:46:44,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-06 00:46:44,873 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-06 00:46:44,873 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-06 00:46:44,958 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5b61877370> has local changes
2025-01-06 00:46:44,958 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#298 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/298/)'
2025-01-06 00:46:44,974 [ scc.git] DEBUG [detached HEAD 6d4ccee] merge master -Dorg -Ssuccess-only
2025-01-06 00:46:44,975 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-06 00:46:44,975 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-06 00:46:44,975 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,975 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-06 00:46:44,975 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-06 00:46:44,975 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,975 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-06 00:46:44,975 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO
2025-01-06 00:46:44,975 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-06 00:46:44,976 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-06 00:46:44,976 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,976 [ scc.merge] INFO
2025-01-06 00:46:44,976 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-06 00:46:44,976 [ scc.merge] INFO
2025-01-06 00:46:44,976 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-06 00:46:44,976 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-06 00:46:44,976 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,976 [ scc.merge] INFO
2025-01-06 00:46:44,976 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-06 00:46:44,976 [ scc.merge] INFO
2025-01-06 00:46:44,976 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-06 00:46:44,976 [ scc.merge] INFO
2025-01-06 00:46:44,976 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-06 00:46:44,976 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2025-01-06 00:46:44,976 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-06 00:46:44,977 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-06 00:46:44,977 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-06 00:46:44,977 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-06 00:46:44,977 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-06 00:46:44,977 [ scc.merge] INFO
2025-01-06 00:46:44,977 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-06 00:46:44,978 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-06 00:46:44,978 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,978 [ scc.merge] INFO
2025-01-06 00:46:44,978 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-06 00:46:44,978 [ scc.merge] INFO
2025-01-06 00:46:44,978 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-06 00:46:44,978 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-06 00:46:44,978 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,978 [ scc.merge] INFO
2025-01-06 00:46:44,978 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,978 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-06 00:46:44,978 [ scc.merge] INFO
2025-01-06 00:46:44,978 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-06 00:46:44,979 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-06 00:46:44,979 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-06 00:46:44,979 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-06 00:46:44,979 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-06 00:46:44,979 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,979 [ scc.merge] INFO
2025-01-06 00:46:44,979 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,979 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-06 00:46:44,980 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,980 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-06 00:46:44,980 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,980 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-06 00:46:44,980 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-06 00:46:44,980 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-06 00:46:44,980 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,980 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-06 00:46:44,980 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,980 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-06 00:46:44,980 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,980 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,981 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-06 00:46:44,981 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,981 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-06 00:46:44,981 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-06 00:46:44,981 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,981 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-06 00:46:44,981 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-06 00:46:44,981 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-06 00:46:44,981 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,981 [ scc.merge] INFO
2025-01-06 00:46:44,981 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,982 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-06 00:46:44,982 [ scc.merge] INFO
2025-01-06 00:46:44,982 [ scc.merge] INFO Repository: ome/scripts
2025-01-06 00:46:44,982 [ scc.merge] INFO Excluded PRs:
2025-01-06 00:46:44,982 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-06 00:46:44,982 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-06 00:46:44,982 [ scc.merge] INFO Already up to date.
2025-01-06 00:46:44,982 [ scc.merge] INFO
2025-01-06 00:46:44,982 [ scc.merge] INFO Merged PRs:
2025-01-06 00:46:44,982 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-06 00:46:44,982 [ scc.merge] INFO
2025-01-06 00:46:44,982 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-06 00:46:44,982 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-06 00:46:44,982 [ scc.merge] INFO
2025-01-06 00:46:44,982 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-06 00:46:44,982 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:44,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-06 00:46:44,990 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:44,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:44,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-06 00:46:44,995 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-06 00:46:45,001 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-06 00:46:45,007 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-06 00:46:45,013 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-06 00:46:45,019 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-06 00:46:45,025 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-06 00:46:45,030 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-06 00:46:45,037 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-06 00:46:45,043 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-06 00:46:45,048 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-06 00:46:45,054 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-06 00:46:45,059 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-06 00:46:45,071 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-06 00:46:45,080 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-06 00:46:45,086 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-06 00:46:45,092 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-06 00:46:45,097 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-06 00:46:45,104 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-06 00:46:45,110 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-06 00:46:45,116 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-06 00:46:45,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-06 00:46:45,121 [ scc.git] DEBUG Calling 'git remote'
2025-01-06 00:46:45,125 [ 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 7d68688] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD f2a8b46] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-06 00:47:32,320 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-01-06 00:47:41,316 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-01-06 00:47:43,608 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-06 00:47:48,089 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-06 00:48:27,281 [ 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