Skipping 106 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-20 00:44:08,587 [ scc.git] DEBUG create mode 100644 src/templates/colorbar.template.html
2025-01-20 00:44:08,587 [ scc.git] DEBUG create mode 100644 src/templates/colorbar_form.template.html
2025-01-20 00:44:08,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:08,737 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:44:08,775 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:08,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:08,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:44:08,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:44:08,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d50146550> has no local changes
2025-01-20 00:44:08,827 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Generated by OMERO-plugins-push#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:44:08,838 [ scc.git] DEBUG [detached HEAD 759fd645] merge master -Dorg -Ssuccess-only
2025-01-20 00:44:08,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:44:08,838 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:44:09,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-20 00:44:09,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-20 00:44:10,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-20 00:44:10,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-20 00:44:11,174 [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-20 00:44:11,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-20 00:44:12,079 [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-20 00:44:12,079 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-20 00:44:12,079 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:44:12,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-20 00:44:12,080 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:12,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:12,086 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:44:12,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:44:12,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:44:12,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:44:12,106 [ scc.git] DEBUG Already up to date.
2025-01-20 00:44:12,107 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-20 00:44:12,485 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-20 00:44:12,485 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-20 00:44:12,490 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:44:12,490 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:12,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:12,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-20 00:44:12,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:12,507 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-20 00:44:12,826 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-20 00:44:12,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:12,830 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-20 00:44:12,830 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-20 00:44:12,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:12,972 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:44:13,014 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:13,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:13,020 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:44:13,058 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:44:13,065 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d501519a0> has no local changes
2025-01-20 00:44:13,065 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:44:13,142 [ scc.git] DEBUG [detached HEAD 0b075c0] merge master -Dorg -Ssuccess-only
2025-01-20 00:44:13,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:44:13,143 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:44:13,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-20 00:44:13,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-20 00:44:14,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-20 00:44:14,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-20 00:44:14,941 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:15,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-20 00:44:16,007 [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-20 00:44:16,471 [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-20 00:44:17,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-20 00:44:17,442 [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-20 00:44:17,443 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-20 00:44:17,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-20 00:44:17,907 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:18,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-20 00:44:18,969 [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-20 00:44:19,458 [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-20 00:44:19,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-20 00:44:20,294 [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-20 00:44:20,295 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-20 00:44:20,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-20 00:44:20,729 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:21,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-20 00:44:21,742 [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-20 00:44:22,213 [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-20 00:44:22,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-20 00:44:23,255 [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-20 00:44:23,256 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-20 00:44:23,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-20 00:44:24,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-20 00:44:24,160 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:24,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-20 00:44:25,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-20 00:44:25,700 [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-20 00:44:26,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-20 00:44:26,596 [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-20 00:44:26,596 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-20 00:44:27,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-20 00:44:27,040 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:27,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-20 00:44:28,042 [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-20 00:44:28,509 [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-20 00:44:29,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-20 00:44:29,484 [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-20 00:44:29,485 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-20 00:44:29,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-20 00:44:29,937 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:30,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-20 00:44:31,058 [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-20 00:44:31,559 [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-20 00:44:32,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-20 00:44:32,471 [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-20 00:44:32,472 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-20 00:44:32,472 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:44:32,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-20 00:44:32,472 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:32,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:32,479 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:44:32,485 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:44:32,485 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:44:32,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:44:32,498 [ scc.git] DEBUG Already up to date.
2025-01-20 00:44:32,499 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-20 00:44:32,816 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:32,816 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-20 00:44:32,821 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-20 00:44:33,124 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:33,124 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-20 00:44:33,130 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-20 00:44:33,433 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:33,433 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-20 00:44:33,440 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-20 00:44:33,768 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:33,768 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-20 00:44:33,773 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-20 00:44:34,079 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:34,079 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-20 00:44:34,085 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-20 00:44:34,371 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-20 00:44:34,372 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-20 00:44:34,377 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:44:34,377 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:34,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:34,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-20 00:44:34,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:34,397 [ 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-20 00:44:34,409 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:34,414 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-20 00:44:34,414 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-20 00:44:34,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:34,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-20 00:44:34,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:34,579 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-20 00:44:34,683 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-20 00:44:34,684 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:34,690 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-20 00:44:34,690 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-20 00:44:34,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:34,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-20 00:44:34,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:34,986 [ 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-20 00:44:35,065 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-20 00:44:35,065 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-20 00:44:35,065 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:44:35,066 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:44:35,073 [ scc.git] DEBUG Calling 'git reset --hard 50c822f4abb4ecfdcdcb36c0cafe5e73ca480672'
2025-01-20 00:44:35,082 [ scc.git] DEBUG HEAD is now at 50c822f merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-20 00:44:35,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:35,336 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-20 00:44:35,343 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-20 00:44:35,350 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/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-20 00:44:35,355 [ scc.config] DEBUG Found github.token
2025-01-20 00:44:35,355 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-20 00:44:35,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-20 00:44:35,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:35,382 [ 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-20 00:44:35,771 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-20 00:44:35,772 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:35,777 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-20 00:44:35,777 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-20 00:44:35,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:35,940 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-20 00:44:35,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:36,004 [ 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-20 00:44:36,120 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-20 00:44:36,120 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:36,125 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-20 00:44:36,125 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-20 00:44:36,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:36,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-20 00:44:36,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:36,359 [ 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-20 00:44:36,466 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-20 00:44:36,466 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-20 00:44:36,466 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:44:36,467 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:44:36,474 [ scc.git] DEBUG Calling 'git reset --hard 5f1be97a764a37dce8a4e9c65681a15fb80895c6'
2025-01-20 00:44:36,484 [ scc.git] DEBUG HEAD is now at 5f1be97 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-20 00:44:36,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:36,718 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-20 00:44:36,725 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-20 00:44:36,732 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/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-20 00:44:36,739 [ scc.config] DEBUG Found github.token
2025-01-20 00:44:36,740 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-20 00:44:36,740 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:44:36,786 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:36,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:36,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:44:36,835 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:44:36,844 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d50176b20> has no local changes
2025-01-20 00:44:36,844 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:44:36,856 [ scc.git] DEBUG [detached HEAD 12b4900] merge master -Dorg -Ssuccess-only
2025-01-20 00:44:36,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:44:36,857 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:44:37,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-20 00:44:37,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-20 00:44:38,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-20 00:44:38,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-20 00:44:39,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-20 00:44:39,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-20 00:44:39,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-20 00:44:40,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82?per_page=1 HTTP/1.1" 200 2
2025-01-20 00:44:40,401 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-20 00:44:40,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-20 00:44:40,854 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-20 00:44:41,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-20 00:44:41,898 [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-20 00:44:42,365 [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-20 00:44:42,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-20 00:44:43,294 [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-20 00:44:43,298 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-20 00:44:43,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-20 00:44:44,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-20 00:44:44,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-20 00:44:45,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-20 00:44:45,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-20 00:44:46,014 [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-20 00:44:46,487 [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-20 00:44:46,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-20 00:44:47,386 [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-20 00:44:47,386 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-20 00:44:47,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-20 00:44:48,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-20 00:44:48,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-20 00:44:49,290 [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-20 00:44:49,729 [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-20 00:44:50,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-20 00:44:50,632 [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-20 00:44:50,633 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-20 00:44:51,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-20 00:44:51,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-20 00:44:52,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-20 00:44:52,460 [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-20 00:44:52,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-20 00:44:53,393 [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-20 00:44:53,394 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-20 00:44:53,395 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:44:53,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-20 00:44:53,395 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:53,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:53,402 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:44:53,407 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:44:53,407 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:44:53,413 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:44:53,419 [ scc.git] DEBUG Already up to date.
2025-01-20 00:44:53,419 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-20 00:44:54,320 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-20 00:44:54,320 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-20 00:44:54,325 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-20 00:44:55,920 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-20 00:44:55,920 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-20 00:44:55,926 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-20 00:44:56,279 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-20 00:44:56,279 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-20 00:44:56,284 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-20 00:44:56,582 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-20 00:44:56,582 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-20 00:44:56,587 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-20 00:44:57,700 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-20 00:44:57,700 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-20 00:44:57,705 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:44:57,705 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:44:57,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:57,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-20 00:44:57,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:57,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-20 00:44:57,813 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-20 00:44:57,877 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:57,881 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-20 00:44:57,882 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-20 00:44:57,882 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-20 00:44:58,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:58,030 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-20 00:44:58,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:58,045 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-20 00:44:58,572 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-20 00:44:58,572 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-20 00:44:58,572 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-20 00:44:58,572 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-20 00:44:58,581 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:58,586 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-20 00:44:58,586 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-20 00:44:58,586 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-20 00:44:58,586 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-20 00:44:58,586 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-20 00:44:58,586 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-20 00:44:58,586 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-20 00:44:58,586 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-20 00:44:58,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:58,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-20 00:44:58,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:58,745 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-20 00:44:58,805 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-20 00:44:58,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:58,820 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-20 00:44:58,820 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-20 00:44:58,820 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-20 00:44:59,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:59,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-20 00:44:59,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:59,130 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-20 00:44:59,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:59,264 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-20 00:44:59,265 [ scc.git] DEBUG package.json | 2 +-
2025-01-20 00:44:59,265 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-20 00:44:59,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:44:59,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-20 00:44:59,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:44:59,531 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-20 00:44:59,810 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-20 00:44:59,811 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-20 00:44:59,811 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-20 00:44:59,811 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-20 00:44:59,811 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-20 00:44:59,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:44:59,816 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-20 00:44:59,816 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-20 00:44:59,816 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-20 00:44:59,816 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-20 00:44:59,816 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-20 00:44:59,817 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-20 00:44:59,817 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-20 00:44:59,817 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-20 00:45:00,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:00,030 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:00,069 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:00,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:00,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:00,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:00,127 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d50112e80> has no local changes
2025-01-20 00:45:00,127 [ 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'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:00,137 [ scc.git] DEBUG [detached HEAD 4d87432] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:00,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:00,137 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:00,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-20 00:45:01,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-20 00:45:01,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-20 00:45:02,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-20 00:45:02,583 [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-20 00:45:03,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-20 00:45:03,531 [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-20 00:45:03,532 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-20 00:45:03,532 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:03,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-20 00:45:03,533 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:03,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:03,539 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:03,544 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:03,545 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:03,550 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:03,557 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:03,557 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-20 00:45:04,158 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-20 00:45:04,158 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-20 00:45:04,164 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:04,164 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:04,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:04,170 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-20 00:45:04,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:04,182 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-20 00:45:04,193 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:45:04,196 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-20 00:45:04,196 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-20 00:45:04,196 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-20 00:45:04,196 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-20 00:45:04,196 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-20 00:45:04,196 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-20 00:45:04,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:04,335 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:04,376 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:04,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:04,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:04,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:04,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d500da5b0> has no local changes
2025-01-20 00:45:04,428 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:04,436 [ scc.git] DEBUG [detached HEAD f3042ed] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:04,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:04,437 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:04,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-20 00:45:05,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-20 00:45:05,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-20 00:45:06,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-20 00:45:06,807 [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-20 00:45:07,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-20 00:45:07,689 [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-20 00:45:07,690 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-20 00:45:08,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-20 00:45:08,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-20 00:45:09,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-20 00:45:09,525 [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-20 00:45:09,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-20 00:45:10,401 [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-20 00:45:10,402 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-20 00:45:10,402 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:10,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-20 00:45:10,402 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:10,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:10,409 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:10,414 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:10,414 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:10,420 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:10,427 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:10,427 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-20 00:45:11,135 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-20 00:45:11,136 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-20 00:45:11,141 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-20 00:45:11,532 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-20 00:45:11,532 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-20 00:45:11,538 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:11,538 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:11,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:11,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-20 00:45:11,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:11,556 [ 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-20 00:45:11,617 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-20 00:45:11,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-20 00:45:11,617 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-20 00:45:11,617 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-20 00:45:11,618 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:11,618 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:11,627 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-20 00:45:11,637 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-20 00:45:11,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:11,765 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-20 00:45:11,774 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-20 00:45:11,786 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-20 00:45:11,793 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:11,793 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-20 00:45:11,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-20 00:45:11,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:11,807 [ 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-20 00:45:11,881 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-20 00:45:11,881 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-20 00:45:11,881 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-20 00:45:11,881 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:11,882 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:11,890 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-20 00:45:11,898 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-20 00:45:12,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:12,157 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-20 00:45:12,167 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-20 00:45:12,173 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/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-20 00:45:12,178 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:12,178 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-20 00:45:12,179 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:12,246 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:12,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:12,260 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:12,313 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:12,322 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d500edb80> has no local changes
2025-01-20 00:45:12,322 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:12,331 [ scc.git] DEBUG [detached HEAD e8ed5b3] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:12,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:12,331 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:12,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-20 00:45:13,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-20 00:45:13,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-20 00:45:14,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-20 00:45:14,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-20 00:45:15,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-20 00:45:15,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-20 00:45:15,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-20 00:45:16,001 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:16,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-20 00:45:16,001 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:16,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:16,019 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:16,029 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:16,039 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:16,040 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:16,040 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,048 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:16,097 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:16,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:16,215 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d500dff40> has no local changes
2025-01-20 00:45:16,216 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:16,517 [ scc.git] DEBUG [detached HEAD 6fc8669] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:16,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:16,517 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:16,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-20 00:45:16,674 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:16,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-20 00:45:16,674 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:16,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:16,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:16,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:16,700 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:16,701 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:16,701 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,707 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:16,747 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:16,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:16,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:16,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:16,805 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d50091940> has no local changes
2025-01-20 00:45:16,805 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:16,954 [ scc.git] DEBUG [detached HEAD fb52555] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:16,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:16,955 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:17,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-20 00:45:17,115 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:17,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-20 00:45:17,115 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:17,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:17,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:17,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:17,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:17,133 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:17,139 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:17,139 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:17,139 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:17,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:17,144 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:17,181 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:17,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:17,190 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:17,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:17,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d5004b5e0> has no local changes
2025-01-20 00:45:17,251 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:17,261 [ scc.git] DEBUG [detached HEAD 75a6365] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:17,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:17,262 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:17,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-20 00:45:18,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-20 00:45:18,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-20 00:45:19,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-20 00:45:19,507 [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-20 00:45:20,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-20 00:45:20,431 [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-20 00:45:20,431 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-20 00:45:20,431 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:20,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-20 00:45:20,432 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:20,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:20,438 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:20,445 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:20,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:20,452 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:20,460 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:20,460 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-20 00:45:20,872 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-20 00:45:20,872 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-20 00:45:20,878 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:20,878 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:20,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:20,886 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-20 00:45:20,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:20,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-20 00:45:21,082 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG Auto-merging setup.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-20 00:45:21,083 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:21,083 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:21,092 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-20 00:45:21,101 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-20 00:45:21,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:21,232 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-20 00:45:21,244 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-20 00:45:21,325 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2025-01-20 00:45:21,334 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:21,334 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-20 00:45:21,334 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:21,379 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:21,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:21,386 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:21,426 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:21,433 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d5004b7f0> has no local changes
2025-01-20 00:45:21,433 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:21,442 [ scc.git] DEBUG [detached HEAD 73a7614] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:21,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:21,443 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:21,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-20 00:45:22,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-20 00:45:22,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-20 00:45:23,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-20 00:45:23,651 [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-20 00:45:24,103 [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-20 00:45:24,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-20 00:45:24,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-20 00:45:25,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-20 00:45:25,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-20 00:45:26,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-20 00:45:26,889 [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-20 00:45:27,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-20 00:45:27,715 [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-20 00:45:27,715 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-20 00:45:27,716 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:27,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-20 00:45:27,716 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:27,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:27,722 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:27,728 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:27,729 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:27,734 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:27,740 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:27,740 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-20 00:45:28,209 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-20 00:45:28,210 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-20 00:45:28,214 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:28,214 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:28,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-20 00:45:28,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,232 [ 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-20 00:45:28,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-20 00:45:28,331 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-20 00:45:28,333 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-20 00:45:28,334 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-20 00:45:28,334 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-20 00:45:28,334 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-20 00:45:28,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:28,462 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:28,504 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:28,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:28,554 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:28,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d5004b640> has no local changes
2025-01-20 00:45:28,562 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:28,617 [ scc.git] DEBUG [detached HEAD b6d4dbf] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:28,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:28,618 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:28,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-20 00:45:28,867 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:28,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-20 00:45:28,867 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:28,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,874 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:28,880 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:28,880 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:28,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:28,897 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:28,897 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:28,897 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:28,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,903 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:28,947 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:28,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:28,954 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:29,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:29,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d500ae550> has no local changes
2025-01-20 00:45:29,008 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:29,019 [ scc.git] DEBUG [detached HEAD 92c65a5] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:29,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:29,020 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:29,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-20 00:45:29,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-20 00:45:30,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-20 00:45:30,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-20 00:45:31,259 [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-20 00:45:31,765 [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-20 00:45:32,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-20 00:45:32,674 [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-20 00:45:32,675 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-20 00:45:32,675 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:32,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-20 00:45:32,675 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:32,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:32,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:32,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:32,691 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:32,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:32,706 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:32,706 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-20 00:45:33,286 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-20 00:45:33,286 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-20 00:45:33,291 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:33,291 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:33,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:33,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-20 00:45:33,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:33,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-20 00:45:33,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:45:33,382 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-20 00:45:33,382 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-20 00:45:33,382 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-20 00:45:33,382 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-20 00:45:33,382 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-20 00:45:33,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:33,521 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:33,568 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:33,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:33,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:33,621 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:33,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d500ae790> has no local changes
2025-01-20 00:45:33,629 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:33,639 [ scc.git] DEBUG [detached HEAD 77aa349] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:33,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:33,639 [ scc.git] INFO Overriding base-branch from master to main
2025-01-20 00:45:33,639 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:33,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-20 00:45:34,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-20 00:45:34,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-20 00:45:35,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-20 00:45:35,899 [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-20 00:45:36,374 [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-20 00:45:36,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-20 00:45:37,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-20 00:45:37,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-20 00:45:38,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-20 00:45:38,814 [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-20 00:45:39,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-20 00:45:39,701 [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-20 00:45:39,702 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-20 00:45:39,703 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:39,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-20 00:45:39,703 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:39,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:39,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-20 00:45:39,717 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:39,717 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-20 00:45:39,723 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-20 00:45:39,729 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:39,729 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-20 00:45:40,059 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-20 00:45:40,059 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-20 00:45:40,064 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:40,064 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:40,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-20 00:45:40,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,087 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-20 00:45:40,150 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-20 00:45:40,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-20 00:45:40,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:40,151 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:40,157 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-20 00:45:40,164 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-20 00:45:40,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:40,297 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-20 00:45:40,303 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-20 00:45:40,308 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-20 00:45:40,313 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:40,314 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-20 00:45:40,314 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:40,352 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:40,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:40,397 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:40,404 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d487e1580> has no local changes
2025-01-20 00:45:40,405 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:40,415 [ scc.git] DEBUG [detached HEAD 832f5da] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:40,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:40,416 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:40,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-20 00:45:40,724 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:40,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-20 00:45:40,724 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:40,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:40,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:40,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:40,744 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:40,753 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:40,753 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:40,753 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:40,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,760 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:40,806 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:40,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:40,813 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:40,857 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:40,867 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d487e14f0> has no local changes
2025-01-20 00:45:40,868 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:40,879 [ scc.git] DEBUG [detached HEAD 9a89d7c] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:40,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:40,880 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:41,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-20 00:45:41,124 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:41,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-20 00:45:41,125 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:41,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:41,131 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:41,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:41,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:41,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:41,150 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:41,151 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:41,151 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:41,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:41,157 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:41,199 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:41,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:41,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:41,248 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:41,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d487f2bb0> has no local changes
2025-01-20 00:45:41,257 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:41,269 [ scc.git] DEBUG [detached HEAD b30b07b] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:41,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:41,270 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:41,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-20 00:45:42,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-20 00:45:42,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-20 00:45:43,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-20 00:45:43,424 [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-20 00:45:43,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-20 00:45:44,241 [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-20 00:45:44,242 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-20 00:45:44,242 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:44,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-20 00:45:44,242 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:44,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:44,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-20 00:45:44,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:44,255 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-20 00:45:44,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-20 00:45:44,266 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:44,267 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-20 00:45:44,739 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-20 00:45:44,740 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-20 00:45:44,745 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:44,745 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:44,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:44,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-20 00:45:44,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:44,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-20 00:45:44,916 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-20 00:45:44,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-20 00:45:44,916 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:44,916 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:44,923 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-20 00:45:44,930 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-20 00:45:45,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:45,060 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-20 00:45:45,068 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-20 00:45:45,074 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-20 00:45:45,079 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:45,079 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-20 00:45:45,080 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:45,118 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:45,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:45,124 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:45,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:45,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d48798a30> has no local changes
2025-01-20 00:45:45,170 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:45,179 [ scc.git] DEBUG [detached HEAD 5d521e4] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:45,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:45,179 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-20 00:45:45,180 [ scc.repo] DEBUG ## PRs found:
2025-01-20 00:45:45,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-20 00:45:46,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-20 00:45:46,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-20 00:45:46,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-20 00:45:47,325 [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-20 00:45:47,788 [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-20 00:45:48,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-20 00:45:48,673 [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-20 00:45:48,674 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-20 00:45:49,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-20 00:45:49,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-20 00:45:50,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-20 00:45:50,492 [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-20 00:45:50,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-20 00:45:51,312 [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-20 00:45:51,313 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-20 00:45:51,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-20 00:45:52,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-20 00:45:52,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-20 00:45:53,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-20 00:45:53,201 [ scc.repo] DEBUG ## Branches found:
2025-01-20 00:45:53,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-20 00:45:53,201 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:53,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:53,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-20 00:45:53,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-20 00:45:53,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-20 00:45:53,221 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-20 00:45:53,228 [ scc.git] DEBUG Already up to date.
2025-01-20 00:45:53,228 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-20 00:45:53,643 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-20 00:45:53,643 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-20 00:45:53,648 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-20 00:45:54,491 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-20 00:45:54,491 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-20 00:45:54,496 [ scc.git] DEBUG ## Unique users: []
2025-01-20 00:45:54,496 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:54,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:54,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-20 00:45:54,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:54,519 [ 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-20 00:45:54,546 [ 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-20 00:45:54,546 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-20 00:45:54,546 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-20 00:45:54,554 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-20 00:45:54,561 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-20 00:45:54,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:54,707 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-20 00:45:54,717 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-20 00:45:54,725 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#311](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-20 00:45:54,730 [ scc.config] DEBUG Found github.token
2025-01-20 00:45:54,731 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-20 00:45:54,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-20 00:45:54,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:54,745 [ 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-20 00:45:54,769 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-20 00:45:54,772 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-20 00:45:54,772 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-20 00:45:55,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:55,094 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-20 00:45:55,140 [ scc.git] DEBUG Get sha1 of %s
2025-01-20 00:45:55,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-20 00:45:55,147 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:55,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:45:55,205 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d48798670> has no local changes
2025-01-20 00:45:55,205 [ 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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:45:55,215 [ scc.git] DEBUG [detached HEAD 9caf4c8] merge master -Dorg -Ssuccess-only
2025-01-20 00:45:55,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:45:55,215 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-20 00:45:55,293 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-20 00:45:55,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:55,484 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-20 00:45:55,490 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-20 00:45:55,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:55,886 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-20 00:45:55,892 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-20 00:45:56,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:56,270 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-20 00:45:56,276 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-20 00:45:56,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:56,660 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-20 00:45:57,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:57,078 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-20 00:45:57,083 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-20 00:45:57,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:57,467 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-20 00:45:57,472 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-20 00:45:57,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:57,860 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-20 00:45:57,865 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-20 00:45:58,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:58,256 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-20 00:45:58,262 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-20 00:45:58,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:58,638 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-20 00:45:58,644 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-20 00:45:59,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:59,015 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-20 00:45:59,019 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-20 00:45:59,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:59,402 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-20 00:45:59,407 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-20 00:45:59,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:45:59,783 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-20 00:45:59,788 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-20 00:46:00,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:00,173 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-20 00:46:00,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:00,574 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-20 00:46:00,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:00,945 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-20 00:46:00,950 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-20 00:46:01,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:01,364 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-20 00:46:01,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:01,744 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-20 00:46:02,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:02,129 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-20 00:46:02,134 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-20 00:46:02,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:02,513 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-20 00:46:02,519 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-20 00:46:02,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:02,914 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-20 00:46:02,919 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-20 00:46:03,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:03,291 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-20 00:46:03,296 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-20 00:46:03,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-20 00:46:03,677 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-20 00:46:03,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-20 00:46:03,776 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1d51225370> has local changes
2025-01-20 00:46:03,776 [ 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`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
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 166 will-moore 'Downsample scale option' (stage: draft)
- 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 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
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'
- PR 500 will-moore 'Support max_active_channels'
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.
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#311 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/311/)'
2025-01-20 00:46:03,812 [ scc.git] DEBUG [detached HEAD e3dbd4d] merge master -Dorg -Ssuccess-only
2025-01-20 00:46:03,812 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-20 00:46:03,813 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-20 00:46:03,813 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,813 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-20 00:46:03,813 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-20 00:46:03,813 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-20 00:46:03,813 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,813 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-20 00:46:03,813 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO
2025-01-20 00:46:03,813 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-20 00:46:03,814 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-20 00:46:03,814 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,814 [ scc.merge] INFO
2025-01-20 00:46:03,814 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-20 00:46:03,814 [ scc.merge] INFO
2025-01-20 00:46:03,814 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-20 00:46:03,814 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-20 00:46:03,814 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,814 [ scc.merge] INFO
2025-01-20 00:46:03,814 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-20 00:46:03,814 [ scc.merge] INFO
2025-01-20 00:46:03,814 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-20 00:46:03,814 [ scc.merge] INFO
2025-01-20 00:46:03,814 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-20 00:46:03,814 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,814 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-20 00:46:03,815 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-20 00:46:03,815 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-20 00:46:03,815 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-20 00:46:03,815 [ scc.merge] INFO
2025-01-20 00:46:03,815 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-20 00:46:03,815 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-20 00:46:03,816 [ scc.merge] INFO
2025-01-20 00:46:03,816 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-20 00:46:03,816 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-20 00:46:03,816 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,816 [ scc.merge] INFO
2025-01-20 00:46:03,816 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-20 00:46:03,816 [ scc.merge] INFO
2025-01-20 00:46:03,816 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-20 00:46:03,816 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-20 00:46:03,816 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,816 [ scc.merge] INFO
2025-01-20 00:46:03,816 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,816 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-20 00:46:03,816 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-20 00:46:03,817 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-20 00:46:03,817 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-20 00:46:03,817 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-20 00:46:03,817 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-20 00:46:03,817 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-20 00:46:03,817 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,817 [ scc.merge] INFO
2025-01-20 00:46:03,818 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-20 00:46:03,818 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,818 [ scc.merge] INFO
2025-01-20 00:46:03,818 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,818 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-20 00:46:03,818 [ scc.merge] INFO
2025-01-20 00:46:03,818 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-20 00:46:03,818 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,818 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-20 00:46:03,818 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-20 00:46:03,818 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-20 00:46:03,818 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,818 [ scc.merge] INFO
2025-01-20 00:46:03,818 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,819 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-20 00:46:03,819 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-20 00:46:03,819 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,819 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-20 00:46:03,819 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,819 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-20 00:46:03,819 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-20 00:46:03,819 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,819 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-20 00:46:03,819 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-20 00:46:03,819 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO
2025-01-20 00:46:03,819 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-20 00:46:03,820 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,820 [ scc.merge] INFO
2025-01-20 00:46:03,820 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,820 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-20 00:46:03,820 [ scc.merge] INFO
2025-01-20 00:46:03,820 [ scc.merge] INFO Repository: ome/scripts
2025-01-20 00:46:03,820 [ scc.merge] INFO Excluded PRs:
2025-01-20 00:46:03,820 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-20 00:46:03,820 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-20 00:46:03,820 [ scc.merge] INFO Already up to date.
2025-01-20 00:46:03,820 [ scc.merge] INFO
2025-01-20 00:46:03,820 [ scc.merge] INFO Merged PRs:
2025-01-20 00:46:03,820 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-20 00:46:03,820 [ scc.merge] INFO
2025-01-20 00:46:03,820 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-20 00:46:03,820 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-20 00:46:03,820 [ scc.merge] INFO
2025-01-20 00:46:03,820 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-20 00:46:03,820 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-20 00:46:03,828 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-20 00:46:03,833 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-20 00:46:03,838 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-20 00:46:03,843 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-20 00:46:03,848 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-20 00:46:03,854 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-20 00:46:03,860 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-20 00:46:03,866 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-20 00:46:03,872 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-20 00:46:03,877 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-20 00:46:03,883 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-20 00:46:03,888 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-20 00:46:03,894 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-20 00:46:03,901 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-20 00:46:03,907 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-20 00:46:03,913 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-20 00:46:03,919 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-20 00:46:03,926 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-20 00:46:03,933 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-20 00:46:03,939 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-20 00:46:03,946 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-20 00:46:03,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-20 00:46:03,953 [ scc.git] DEBUG Calling 'git remote'
2025-01-20 00:46:03,959 [ 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 2026b62] 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 a80640a9
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 53a6604] 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-20 00:46:51,718 [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-20 00:47:00,304 [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-20 00:47:02,612 [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-20 00:47:07,058 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-20 00:47:44,826 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
