Skipping 106 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-01-16 00:42:20,514 [ scc.git] DEBUG create mode 100644 src/templates/colorbar.template.html
2025-01-16 00:42:20,516 [ scc.git] DEBUG create mode 100644 src/templates/colorbar_form.template.html
2025-01-16 00:42:20,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:20,647 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:42:20,690 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:20,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:20,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:42:20,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:42:20,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1869cfe580> has no local changes
2025-01-16 00:42:20,746 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:42:20,756 [ scc.git] DEBUG [detached HEAD d1424ca5] merge master -Dorg -Ssuccess-only
2025-01-16 00:42:20,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:42:20,757 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:42:21,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-16 00:42:21,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-16 00:42:22,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-16 00:42:22,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-16 00:42:23,150 [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-16 00:42:23,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-16 00:42:24,072 [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-16 00:42:24,072 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-16 00:42:24,073 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:42:24,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-16 00:42:24,073 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:24,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:24,080 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:42:24,085 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:42:24,086 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:42:24,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:42:24,098 [ scc.git] DEBUG Already up to date.
2025-01-16 00:42:24,099 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-16 00:42:24,507 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-16 00:42:24,507 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-16 00:42:24,512 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:42:24,512 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:24,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:24,518 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-16 00:42:24,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:24,529 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-16 00:42:24,538 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-16 00:42:24,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:42:24,541 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-16 00:42:24,542 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-16 00:42:24,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:24,674 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:42:24,718 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:24,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:24,725 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:42:24,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:42:24,779 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1869d139a0> has no local changes
2025-01-16 00:42:24,780 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:42:24,790 [ scc.git] DEBUG [detached HEAD 4ec712c] merge master -Dorg -Ssuccess-only
2025-01-16 00:42:24,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:42:24,790 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:42:25,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-16 00:42:25,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-16 00:42:26,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-16 00:42:26,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-16 00:42:26,667 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:27,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-16 00:42:27,718 [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-16 00:42:28,214 [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-16 00:42:28,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-16 00:42:29,049 [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-16 00:42:29,050 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-16 00:42:29,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-16 00:42:29,504 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:30,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-16 00:42:30,552 [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-16 00:42:31,072 [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-16 00:42:31,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-16 00:42:32,022 [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-16 00:42:32,023 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-16 00:42:32,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-16 00:42:32,483 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:33,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-16 00:42:33,613 [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-16 00:42:34,111 [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-16 00:42:34,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-16 00:42:35,095 [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-16 00:42:35,097 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-16 00:42:35,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-16 00:42:35,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-16 00:42:35,994 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:36,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-16 00:42:37,043 [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-16 00:42:37,605 [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-16 00:42:38,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-16 00:42:38,512 [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-16 00:42:38,513 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-16 00:42:38,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-16 00:42:38,994 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:39,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-16 00:42:40,073 [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-16 00:42:40,563 [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-16 00:42:41,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-16 00:42:41,485 [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-16 00:42:41,487 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-16 00:42:41,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-16 00:42:41,948 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:42,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-16 00:42:42,973 [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-16 00:42:43,487 [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-16 00:42:44,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-16 00:42:44,505 [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-16 00:42:44,506 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-16 00:42:44,506 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:42:44,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-16 00:42:44,506 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:44,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:44,512 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:42:44,517 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:42:44,517 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:42:44,522 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:42:44,527 [ scc.git] DEBUG Already up to date.
2025-01-16 00:42:44,527 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-16 00:42:44,827 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:44,828 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-16 00:42:44,833 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-16 00:42:45,116 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:45,117 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-16 00:42:45,121 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-16 00:42:45,422 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:45,423 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-16 00:42:45,427 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-16 00:42:45,737 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:45,738 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-16 00:42:45,742 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-16 00:42:46,058 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:46,059 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-16 00:42:46,064 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-16 00:42:46,341 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-16 00:42:46,341 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-16 00:42:46,345 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:42:46,345 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:46,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:46,352 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-16 00:42:46,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:46,380 [ 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-16 00:42:46,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:42:46,451 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-16 00:42:46,451 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-16 00:42:46,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:46,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-16 00:42:46,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:46,906 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-16 00:42:47,041 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-16 00:42:47,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:42:47,047 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-16 00:42:47,047 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-16 00:42:47,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:47,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-16 00:42:47,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:47,211 [ 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-16 00:42:47,336 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-16 00:42:47,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-16 00:42:47,337 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:42:47,337 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:42:47,344 [ scc.git] DEBUG Calling 'git reset --hard 1f4409fe5558d461a66b22c914681bdf232a34c7'
2025-01-16 00:42:47,351 [ scc.git] DEBUG HEAD is now at 1f4409f merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-16 00:42:47,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:47,586 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-16 00:42:47,592 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-16 00:42:47,599 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/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-16 00:42:47,605 [ scc.config] DEBUG Found github.token
2025-01-16 00:42:47,606 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-16 00:42:47,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-16 00:42:47,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:47,620 [ 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-16 00:42:47,736 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-16 00:42:47,737 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:42:47,742 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-16 00:42:47,742 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-16 00:42:47,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:47,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-16 00:42:48,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:48,026 [ 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-16 00:42:48,057 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-16 00:42:48,058 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:42:48,063 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-16 00:42:48,063 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-16 00:42:48,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:48,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-16 00:42:48,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:48,369 [ 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-16 00:42:48,494 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-16 00:42:48,494 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-16 00:42:48,494 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:42:48,495 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:42:48,501 [ scc.git] DEBUG Calling 'git reset --hard 998e7901bd80d0398c96fe78c30173567a5b53ac'
2025-01-16 00:42:48,508 [ scc.git] DEBUG HEAD is now at 998e790 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-16 00:42:48,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:42:48,747 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-16 00:42:48,753 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-16 00:42:48,759 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/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-16 00:42:48,764 [ scc.config] DEBUG Found github.token
2025-01-16 00:42:48,765 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-16 00:42:48,765 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:42:48,806 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:42:48,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:42:48,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:42:48,851 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:42:48,859 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1869d15b20> has no local changes
2025-01-16 00:42:48,859 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:42:48,869 [ scc.git] DEBUG [detached HEAD 311dbdc] merge master -Dorg -Ssuccess-only
2025-01-16 00:42:48,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:42:48,870 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:42:49,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-16 00:42:49,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-16 00:42:50,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-16 00:42:50,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-16 00:42:51,203 [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-16 00:42:51,674 [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-16 00:42:52,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-16 00:42:52,518 [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-16 00:42:52,519 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-16 00:42:52,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-16 00:42:52,966 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-16 00:42:53,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-16 00:42:53,997 [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-16 00:42:54,465 [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-16 00:42:55,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-16 00:42:55,425 [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-16 00:42:55,426 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-16 00:42:55,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-16 00:42:56,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-16 00:42:56,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-16 00:42:57,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-16 00:42:57,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-16 00:42:58,308 [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-16 00:42:58,828 [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-16 00:42:59,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-16 00:42:59,680 [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-16 00:42:59,681 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-16 00:43:00,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-16 00:43:00,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-16 00:43:01,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-16 00:43:01,687 [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-16 00:43:02,118 [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-16 00:43:02,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-16 00:43:02,920 [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-16 00:43:02,921 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-16 00:43:03,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-16 00:43:03,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-16 00:43:04,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-16 00:43:04,789 [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-16 00:43:05,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-16 00:43:05,732 [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-16 00:43:05,733 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-16 00:43:05,734 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:05,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-16 00:43:05,734 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:05,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:05,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:05,745 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:05,746 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:05,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:05,758 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:05,759 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-16 00:43:07,773 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-16 00:43:07,774 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-16 00:43:07,780 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-16 00:43:09,022 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-16 00:43:09,022 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-16 00:43:09,027 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-16 00:43:09,616 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-16 00:43:09,616 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-16 00:43:09,621 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-16 00:43:09,902 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-16 00:43:09,902 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-16 00:43:09,907 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-16 00:43:10,741 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-16 00:43:10,742 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-16 00:43:10,749 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:10,749 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:10,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:10,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-16 00:43:10,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:10,768 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-16 00:43:10,887 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-16 00:43:10,888 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:10,893 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-16 00:43:10,893 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-16 00:43:10,893 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-16 00:43:11,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:11,026 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-16 00:43:11,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:11,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-16 00:43:11,434 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-16 00:43:11,434 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-16 00:43:11,434 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-16 00:43:11,434 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-16 00:43:11,435 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:11,439 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-16 00:43:11,439 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-16 00:43:11,439 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-16 00:43:11,439 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-16 00:43:11,439 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-16 00:43:11,439 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-16 00:43:11,439 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-16 00:43:11,439 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-16 00:43:11,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:11,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-16 00:43:11,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:11,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-16 00:43:11,627 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-16 00:43:11,627 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:11,631 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-16 00:43:11,631 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-16 00:43:11,631 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-16 00:43:12,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:12,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-16 00:43:12,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:12,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-16 00:43:12,144 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:12,154 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-16 00:43:12,154 [ scc.git] DEBUG package.json | 2 +-
2025-01-16 00:43:12,155 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-16 00:43:12,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:12,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-16 00:43:12,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:12,447 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-16 00:43:12,606 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-16 00:43:12,607 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-16 00:43:12,607 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-16 00:43:12,607 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-16 00:43:12,607 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-16 00:43:12,607 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:12,613 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-16 00:43:12,613 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-16 00:43:12,613 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-16 00:43:12,613 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-16 00:43:12,613 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-16 00:43:12,613 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-16 00:43:12,613 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-16 00:43:12,613 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-16 00:43:12,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:12,812 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:12,853 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:12,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:12,861 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:12,903 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:12,916 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1869cd3e80> has no local changes
2025-01-16 00:43:12,916 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:12,931 [ scc.git] DEBUG [detached HEAD cff9977] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:12,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:12,932 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:13,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-16 00:43:13,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-16 00:43:14,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-16 00:43:14,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-16 00:43:15,227 [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-16 00:43:15,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-16 00:43:16,178 [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-16 00:43:16,179 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-16 00:43:16,179 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:16,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-16 00:43:16,180 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:16,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:16,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:16,195 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:16,195 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:16,203 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:16,210 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:16,211 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-16 00:43:16,928 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-16 00:43:16,928 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-16 00:43:16,933 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:16,933 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:16,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:16,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-16 00:43:16,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:16,952 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-16 00:43:16,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:16,966 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-16 00:43:16,966 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-16 00:43:16,966 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-16 00:43:16,966 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-16 00:43:16,966 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-16 00:43:16,966 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-16 00:43:17,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:17,099 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:17,148 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:17,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:17,168 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:17,213 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:17,220 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18684985b0> has no local changes
2025-01-16 00:43:17,221 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:17,231 [ scc.git] DEBUG [detached HEAD 976768d] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:17,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:17,232 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:17,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-16 00:43:18,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-16 00:43:18,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-16 00:43:19,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-16 00:43:19,553 [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-16 00:43:20,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-16 00:43:20,499 [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-16 00:43:20,500 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-16 00:43:20,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-16 00:43:21,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-16 00:43:21,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-16 00:43:22,361 [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-16 00:43:22,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-16 00:43:23,295 [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-16 00:43:23,295 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-16 00:43:23,296 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:23,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-16 00:43:23,296 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:23,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:23,302 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:23,308 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:23,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:23,316 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:23,324 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:23,324 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-16 00:43:24,344 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-16 00:43:24,345 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-16 00:43:24,349 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-16 00:43:25,212 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-16 00:43:25,212 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-16 00:43:25,218 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:25,218 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:25,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:25,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-16 00:43:25,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:25,237 [ 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-16 00:43:25,337 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-16 00:43:25,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-16 00:43:25,337 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-16 00:43:25,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-16 00:43:25,338 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:43:25,338 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:43:25,344 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-16 00:43:25,352 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-16 00:43:25,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:25,580 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-16 00:43:25,588 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-16 00:43:25,595 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-01-16 00:43:25,602 [ scc.config] DEBUG Found github.token
2025-01-16 00:43:25,602 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-16 00:43:25,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-16 00:43:25,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:25,616 [ 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-16 00:43:25,656 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-16 00:43:25,656 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-16 00:43:25,656 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-16 00:43:25,656 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:43:25,656 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:43:25,664 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-16 00:43:25,673 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-16 00:43:25,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:25,969 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-16 00:43:25,977 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-16 00:43:25,984 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/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-16 00:43:25,990 [ scc.config] DEBUG Found github.token
2025-01-16 00:43:25,990 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-16 00:43:25,991 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:26,037 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:26,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:26,045 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:26,088 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:26,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18684abb80> has no local changes
2025-01-16 00:43:26,097 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:26,107 [ scc.git] DEBUG [detached HEAD f2831d3] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:26,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:26,108 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:26,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-16 00:43:26,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-16 00:43:27,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-16 00:43:27,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-16 00:43:28,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-16 00:43:28,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-16 00:43:29,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-16 00:43:29,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-16 00:43:29,763 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:29,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-16 00:43:29,763 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:29,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:29,769 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:29,775 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:29,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:29,782 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:29,789 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:29,789 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:29,789 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:29,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:29,796 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:29,838 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:29,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:29,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:29,890 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:29,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1868497f40> has no local changes
2025-01-16 00:43:29,897 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:29,905 [ scc.git] DEBUG [detached HEAD 28eedf8] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:29,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:29,906 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:30,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-16 00:43:30,172 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:30,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-16 00:43:30,172 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,179 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:30,186 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:30,186 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:30,192 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:30,198 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:30,199 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:30,199 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,204 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:30,249 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,261 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:30,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:30,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f186844e940> has no local changes
2025-01-16 00:43:30,318 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:30,327 [ scc.git] DEBUG [detached HEAD 3cd7b91] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:30,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:30,328 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:30,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-16 00:43:30,596 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:30,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-16 00:43:30,596 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,603 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:30,609 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:30,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:30,616 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:30,622 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:30,622 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:30,622 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,629 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:30,672 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:30,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:30,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:30,738 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:30,745 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18684085e0> has no local changes
2025-01-16 00:43:30,746 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:30,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:30,756 [ scc.git] DEBUG [detached HEAD 8155380] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:30,756 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:31,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-16 00:43:31,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-16 00:43:31,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-16 00:43:32,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-16 00:43:32,947 [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-16 00:43:33,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-16 00:43:33,953 [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-16 00:43:33,954 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-16 00:43:33,954 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:33,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-16 00:43:33,954 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:33,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:33,961 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:33,967 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:33,967 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:33,974 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:33,982 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:33,982 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-16 00:43:34,426 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-16 00:43:34,426 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-16 00:43:34,431 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:34,431 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:34,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:34,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-16 00:43:34,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:34,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-16 00:43:34,578 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-16 00:43:34,578 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:43:34,579 [ scc.git] DEBUG Auto-merging setup.py
2025-01-16 00:43:34,579 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-16 00:43:34,579 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:43:34,586 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-16 00:43:34,593 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-16 00:43:34,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:34,744 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-16 00:43:34,751 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-16 00:43:34,758 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-01-16 00:43:34,764 [ scc.config] DEBUG Found github.token
2025-01-16 00:43:34,764 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-16 00:43:34,764 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:34,814 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:34,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:34,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:34,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:34,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18684087f0> has no local changes
2025-01-16 00:43:34,875 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:34,884 [ scc.git] DEBUG [detached HEAD d1a09b6] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:34,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:34,884 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:35,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-16 00:43:35,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-16 00:43:36,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-16 00:43:36,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-16 00:43:37,153 [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-16 00:43:37,651 [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-16 00:43:38,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-16 00:43:38,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-16 00:43:39,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-16 00:43:39,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-16 00:43:39,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-16 00:43:40,483 [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-16 00:43:40,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-16 00:43:41,321 [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-16 00:43:41,322 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-16 00:43:41,322 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:41,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-16 00:43:41,323 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:41,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:41,329 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:41,335 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:41,335 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:41,342 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:41,348 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:41,348 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-16 00:43:41,718 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-16 00:43:41,719 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-16 00:43:41,723 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:41,723 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:41,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:41,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-16 00:43:41,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:41,744 [ 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-16 00:43:41,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-16 00:43:41,762 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-16 00:43:41,765 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-16 00:43:41,765 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-16 00:43:41,765 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-16 00:43:41,766 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-16 00:43:41,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:41,894 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:41,936 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:41,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:41,942 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:41,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:41,992 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1868408640> has no local changes
2025-01-16 00:43:41,992 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:42,005 [ scc.git] DEBUG [detached HEAD b866e7b] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:42,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:42,006 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:42,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-16 00:43:42,318 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:42,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-16 00:43:42,318 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:42,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:42,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:42,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:42,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:42,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:42,343 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:42,343 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:42,343 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:42,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:42,348 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:42,392 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:42,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:42,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:42,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:42,451 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18684624c0> has no local changes
2025-01-16 00:43:42,451 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:42,459 [ scc.git] DEBUG [detached HEAD ccb9191] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:42,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:42,460 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:42,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-16 00:43:43,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-16 00:43:43,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-16 00:43:44,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-16 00:43:44,762 [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-16 00:43:45,223 [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-16 00:43:45,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-16 00:43:46,083 [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-16 00:43:46,084 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-16 00:43:46,084 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:46,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-16 00:43:46,084 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:46,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:46,092 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:46,099 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:46,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:46,106 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:46,114 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:46,114 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-16 00:43:46,803 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-16 00:43:46,804 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-16 00:43:46,808 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:46,808 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:46,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:46,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-16 00:43:46,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:46,827 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-16 00:43:46,836 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:43:46,839 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-16 00:43:46,839 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-16 00:43:46,839 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-16 00:43:46,839 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-16 00:43:46,839 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-16 00:43:46,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:46,990 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:47,034 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:47,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:47,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:47,082 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:47,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1868462790> has no local changes
2025-01-16 00:43:47,089 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:47,098 [ scc.git] DEBUG [detached HEAD 333a062] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:47,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:47,099 [ scc.git] INFO Overriding base-branch from master to main
2025-01-16 00:43:47,099 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:47,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-16 00:43:47,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-16 00:43:48,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-16 00:43:48,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-16 00:43:49,403 [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-16 00:43:49,850 [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-16 00:43:50,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-16 00:43:50,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-16 00:43:51,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-16 00:43:51,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-16 00:43:52,216 [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-16 00:43:52,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-16 00:43:53,089 [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-16 00:43:53,090 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-16 00:43:53,090 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:53,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-16 00:43:53,090 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:53,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:53,097 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-16 00:43:53,103 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:53,103 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-16 00:43:53,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-16 00:43:53,114 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:53,114 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-16 00:43:53,590 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-16 00:43:53,590 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-16 00:43:53,595 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:53,595 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:53,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:53,601 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-16 00:43:53,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:53,611 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-16 00:43:53,689 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-16 00:43:53,689 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-16 00:43:53,689 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:43:53,689 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:43:53,696 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-16 00:43:53,702 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-16 00:43:53,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:53,835 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-16 00:43:53,842 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-16 00:43:53,847 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-16 00:43:53,852 [ scc.config] DEBUG Found github.token
2025-01-16 00:43:53,852 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-16 00:43:53,852 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:53,889 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:53,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:53,894 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:53,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:53,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18683e0580> has no local changes
2025-01-16 00:43:53,937 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:53,945 [ scc.git] DEBUG [detached HEAD 1a23e47] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:53,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:53,946 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:54,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-16 00:43:54,239 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:54,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-16 00:43:54,239 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,246 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:54,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:54,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:54,257 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:54,264 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:54,264 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:54,264 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,270 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:54,311 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:54,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:54,363 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18683e04f0> has no local changes
2025-01-16 00:43:54,364 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:54,372 [ scc.git] DEBUG [detached HEAD 8045d8b] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:54,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:54,373 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:54,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-16 00:43:54,643 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:54,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-16 00:43:54,643 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:54,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:54,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:54,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:54,666 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:54,666 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:54,666 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,671 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:54,711 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:54,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:54,716 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:54,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:54,764 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18683f1bb0> has no local changes
2025-01-16 00:43:54,764 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:54,772 [ scc.git] DEBUG [detached HEAD febb21c] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:54,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:54,772 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:55,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-16 00:43:55,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-16 00:43:56,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-16 00:43:56,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-16 00:43:57,029 [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-16 00:43:57,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-16 00:43:57,883 [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-16 00:43:57,883 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-16 00:43:57,883 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:43:57,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-16 00:43:57,884 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:57,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:57,890 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-16 00:43:57,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:43:57,895 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-16 00:43:57,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-16 00:43:57,906 [ scc.git] DEBUG Already up to date.
2025-01-16 00:43:57,906 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-16 00:43:58,246 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-16 00:43:58,246 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-16 00:43:58,251 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:43:58,251 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:58,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:58,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-16 00:43:58,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:58,267 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-16 00:43:58,356 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-16 00:43:58,357 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-16 00:43:58,357 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:43:58,357 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:43:58,363 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-16 00:43:58,370 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-16 00:43:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:43:58,511 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-16 00:43:58,517 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-16 00:43:58,523 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-16 00:43:58,527 [ scc.config] DEBUG Found github.token
2025-01-16 00:43:58,528 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-16 00:43:58,528 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:43:58,565 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:43:58,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:43:58,571 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:43:58,608 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:43:58,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1868399a30> has no local changes
2025-01-16 00:43:58,616 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:43:58,625 [ scc.git] DEBUG [detached HEAD 2416fa1] merge master -Dorg -Ssuccess-only
2025-01-16 00:43:58,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:43:58,625 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-16 00:43:58,625 [ scc.repo] DEBUG ## PRs found:
2025-01-16 00:43:59,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-16 00:43:59,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-16 00:43:59,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-16 00:44:00,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-16 00:44:00,901 [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-16 00:44:01,360 [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-16 00:44:01,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-16 00:44:02,174 [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-16 00:44:02,175 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-16 00:44:02,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-16 00:44:03,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-16 00:44:03,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-16 00:44:04,067 [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-16 00:44:04,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-16 00:44:04,870 [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-16 00:44:04,871 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-16 00:44:05,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-16 00:44:05,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-16 00:44:06,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-16 00:44:06,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-16 00:44:06,871 [ scc.repo] DEBUG ## Branches found:
2025-01-16 00:44:06,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-16 00:44:06,871 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:44:06,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:44:06,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-16 00:44:06,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-16 00:44:06,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-16 00:44:06,889 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-16 00:44:06,895 [ scc.git] DEBUG Already up to date.
2025-01-16 00:44:06,895 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-16 00:44:07,618 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-16 00:44:07,619 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-16 00:44:07,623 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-16 00:44:08,269 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-16 00:44:08,269 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-16 00:44:08,273 [ scc.git] DEBUG ## Unique users: []
2025-01-16 00:44:08,273 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:44:08,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:44:08,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-16 00:44:08,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:44:08,295 [ 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-16 00:44:08,399 [ 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-16 00:44:08,399 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-16 00:44:08,399 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-16 00:44:08,406 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-16 00:44:08,412 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-16 00:44:08,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:08,559 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-16 00:44:08,568 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-16 00:44:08,576 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#307](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-16 00:44:08,581 [ scc.config] DEBUG Found github.token
2025-01-16 00:44:08,581 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-16 00:44:08,581 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-16 00:44:08,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:44:08,595 [ 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-16 00:44:08,607 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-16 00:44:08,610 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-16 00:44:08,610 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-16 00:44:08,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:08,973 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-16 00:44:09,015 [ scc.git] DEBUG Get sha1 of %s
2025-01-16 00:44:09,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-16 00:44:09,021 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:44:09,060 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:44:09,068 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1868399670> has no local changes
2025-01-16 00:44:09,068 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:44:09,077 [ scc.git] DEBUG [detached HEAD 98474de] merge master -Dorg -Ssuccess-only
2025-01-16 00:44:09,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:09,078 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-16 00:44:09,160 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-16 00:44:09,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:09,377 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-16 00:44:09,382 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-16 00:44:09,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:09,780 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-16 00:44:09,785 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-16 00:44:10,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:10,166 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-16 00:44:10,170 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-16 00:44:10,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:10,556 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-16 00:44:10,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:10,929 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-16 00:44:10,934 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-16 00:44:11,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:11,315 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-16 00:44:11,320 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-16 00:44:11,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:11,696 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-16 00:44:11,702 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-16 00:44:12,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:12,081 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-16 00:44:12,086 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-16 00:44:12,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:12,473 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-16 00:44:12,478 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-16 00:44:12,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:12,857 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-16 00:44:12,865 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-16 00:44:13,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:13,257 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-16 00:44:13,262 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-16 00:44:13,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:13,665 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-16 00:44:13,669 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-16 00:44:14,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:14,050 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-16 00:44:14,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:14,450 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-16 00:44:14,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:14,829 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-16 00:44:14,834 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-16 00:44:15,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:15,226 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-16 00:44:15,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:15,636 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-16 00:44:16,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:16,021 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-16 00:44:16,028 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-16 00:44:16,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:16,419 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-16 00:44:16,425 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-16 00:44:16,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:16,833 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-16 00:44:16,839 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-16 00:44:17,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:17,241 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-16 00:44:17,247 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-16 00:44:17,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-16 00:44:17,634 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-16 00:44:17,635 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-16 00:44:17,739 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f186ade5be0> has local changes
2025-01-16 00:44:17,739 [ 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#307 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/307/)'
2025-01-16 00:44:17,759 [ scc.git] DEBUG [detached HEAD 0c39cf0] merge master -Dorg -Ssuccess-only
2025-01-16 00:44:17,760 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-16 00:44:17,760 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-16 00:44:17,760 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-16 00:44:17,761 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-16 00:44:17,761 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-16 00:44:17,761 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-16 00:44:17,761 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-16 00:44:17,761 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-16 00:44:17,761 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-16 00:44:17,761 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,761 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,761 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-16 00:44:17,761 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-16 00:44:17,762 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-16 00:44:17,762 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-16 00:44:17,762 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-16 00:44:17,762 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-16 00:44:17,762 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-16 00:44:17,762 [ scc.merge] INFO
2025-01-16 00:44:17,762 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-16 00:44:17,762 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-16 00:44:17,763 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-16 00:44:17,763 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-16 00:44:17,763 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-16 00:44:17,763 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-16 00:44:17,763 [ scc.merge] INFO
2025-01-16 00:44:17,763 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-16 00:44:17,763 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-16 00:44:17,763 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,764 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-16 00:44:17,764 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,764 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-16 00:44:17,764 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-16 00:44:17,764 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,764 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-16 00:44:17,764 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO
2025-01-16 00:44:17,764 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-16 00:44:17,765 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-16 00:44:17,765 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-16 00:44:17,765 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-16 00:44:17,765 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-16 00:44:17,765 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-16 00:44:17,765 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-16 00:44:17,765 [ scc.merge] INFO
2025-01-16 00:44:17,765 [ scc.merge] INFO Repository: ome/scripts
2025-01-16 00:44:17,765 [ scc.merge] INFO Excluded PRs:
2025-01-16 00:44:17,765 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-16 00:44:17,766 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-16 00:44:17,766 [ scc.merge] INFO Already up to date.
2025-01-16 00:44:17,766 [ scc.merge] INFO
2025-01-16 00:44:17,766 [ scc.merge] INFO Merged PRs:
2025-01-16 00:44:17,766 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-16 00:44:17,766 [ scc.merge] INFO
2025-01-16 00:44:17,766 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-16 00:44:17,766 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-16 00:44:17,766 [ scc.merge] INFO
2025-01-16 00:44:17,766 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-16 00:44:17,766 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-16 00:44:17,775 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-16 00:44:17,784 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-16 00:44:17,792 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-16 00:44:17,800 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-16 00:44:17,808 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-16 00:44:17,817 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-16 00:44:17,824 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-16 00:44:17,832 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-16 00:44:17,840 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-16 00:44:17,848 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-16 00:44:17,856 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-16 00:44:17,863 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-16 00:44:17,871 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-16 00:44:17,880 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-16 00:44:17,888 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-16 00:44:17,897 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-16 00:44:17,906 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-16 00:44:17,915 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-16 00:44:17,924 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-16 00:44:17,932 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-16 00:44:17,941 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-16 00:44:17,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-16 00:44:17,951 [ scc.git] DEBUG Calling 'git remote'
2025-01-16 00:44:17,958 [ 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 8507e07] 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 ea03573] 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-16 00:45:03,961 [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-16 00:45:12,781 [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-16 00:45:15,199 [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-16 00:45:19,691 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-16 00:46:03,205 [ 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/c7b3cdfa/images/svgs/logo.svg){kind=logo}
