Skipping 104 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:43:52,911 [ scc.git] DEBUG [detached HEAD ad87356b] merge master -Dorg -Ssuccess-only
2024-12-17 00:43:52,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:43:52,912 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:43:53,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-12-17 00:43:53,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-12-17 00:43:54,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-12-17 00:43:54,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-17 00:43:55,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:43:55,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-12-17 00:43:56,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:43:56,301 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-12-17 00:43:56,301 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:43:56,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-17 00:43:56,301 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:43:56,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:43:56,307 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:43:56,312 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:43:56,312 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:43:56,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:43:56,322 [ scc.git] DEBUG Already up to date.
2024-12-17 00:43:56,322 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-12-17 00:43:56,702 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-12-17 00:43:56,702 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-12-17 00:43:56,707 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:43:56,707 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:43:56,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:43:56,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-17 00:43:56,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:43:56,723 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-12-17 00:43:56,732 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-12-17 00:43:56,733 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:43:56,736 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-12-17 00:43:56,736 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-17 00:43:56,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:43:56,872 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:43:56,913 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:43:56,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:43:56,919 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:43:56,960 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:43:56,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6ab94e50> has no local changes
2024-12-17 00:43:56,967 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:43:56,975 [ scc.git] DEBUG [detached HEAD 9fb7d29] merge master -Dorg -Ssuccess-only
2024-12-17 00:43:56,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:43:56,976 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:43:57,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-17 00:43:57,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-17 00:43:58,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-17 00:43:58,326 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:43:58,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-17 00:43:59,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:43:59,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:00,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-17 00:44:00,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:00,881 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-17 00:44:01,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-17 00:44:01,343 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:01,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-17 00:44:02,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:02,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:03,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-17 00:44:03,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:03,919 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-17 00:44:04,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-17 00:44:04,399 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:04,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-17 00:44:05,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:06,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:06,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-17 00:44:07,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:07,026 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-17 00:44:07,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-17 00:44:08,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-17 00:44:08,007 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:08,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-17 00:44:09,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:09,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
2024-12-17 00:44:10,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-17 00:44:10,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:10,653 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-17 00:44:11,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-17 00:44:11,133 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:11,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-17 00:44:12,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:12,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:13,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-17 00:44:13,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:13,665 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-17 00:44:14,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-17 00:44:14,121 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:14,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-17 00:44:15,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:15,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:16,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-17 00:44:16,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:16,593 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-17 00:44:16,593 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:16,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-17 00:44:16,593 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:16,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:16,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:16,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:16,604 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:16,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:16,614 [ scc.git] DEBUG Already up to date.
2024-12-17 00:44:16,615 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-17 00:44:16,917 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:16,917 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-17 00:44:16,921 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-17 00:44:17,246 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:17,246 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-17 00:44:17,251 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-17 00:44:17,541 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:17,542 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-17 00:44:17,546 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-17 00:44:17,826 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:17,827 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-17 00:44:17,831 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-17 00:44:18,114 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:18,115 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-17 00:44:18,119 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-17 00:44:18,438 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-17 00:44:18,438 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-17 00:44:18,442 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:18,442 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:18,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:18,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-17 00:44:18,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:18,459 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-17 00:44:18,561 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:18,566 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-17 00:44:18,566 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-17 00:44:18,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:18,709 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-17 00:44:18,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:18,720 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-17 00:44:18,853 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-17 00:44:18,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:18,877 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-17 00:44:18,877 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-17 00:44:19,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:19,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-17 00:44:19,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:19,124 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-17 00:44:19,150 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-17 00:44:19,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-17 00:44:19,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:44:19,151 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:44:19,157 [ scc.git] DEBUG Calling 'git reset --hard 441dead7b1b798e2334d31ffdfef264640ec7c46'
2024-12-17 00:44:19,165 [ scc.git] DEBUG HEAD is now at 441dead merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-17 00:44:19,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:19,495 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-17 00:44:19,501 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-17 00:44:19,506 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2024-12-17 00:44:19,511 [ scc.config] DEBUG Found github.token
2024-12-17 00:44:19,511 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-17 00:44:19,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-17 00:44:19,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:19,520 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-17 00:44:19,555 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-17 00:44:19,556 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:19,561 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-17 00:44:19,561 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-17 00:44:19,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:19,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-17 00:44:19,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:19,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-17 00:44:19,916 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-17 00:44:19,916 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:19,921 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-17 00:44:19,921 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-17 00:44:20,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:20,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-17 00:44:20,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:20,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-17 00:44:20,445 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-17 00:44:20,445 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-17 00:44:20,445 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:44:20,446 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:44:20,451 [ scc.git] DEBUG Calling 'git reset --hard 71ff7ae55fb221e1407e1725b36174c7378fecc1'
2024-12-17 00:44:20,458 [ scc.git] DEBUG HEAD is now at 71ff7ae merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-17 00:44:20,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:20,663 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-17 00:44:20,670 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-17 00:44:20,675 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2024-12-17 00:44:20,680 [ scc.config] DEBUG Found github.token
2024-12-17 00:44:20,680 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-17 00:44:21,509 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-17 00:44:21,510 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:21,551 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:21,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:21,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:21,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:21,605 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6abb6f40> has no local changes
2024-12-17 00:44:21,606 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:21,614 [ scc.git] DEBUG [detached HEAD 80e4fb7] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:21,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:21,615 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:22,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-17 00:44:22,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-17 00:44:22,632 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-17 00:44:23,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-17 00:44:23,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:24,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:24,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-17 00:44:25,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:25,181 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-17 00:44:25,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-17 00:44:26,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-17 00:44:26,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-17 00:44:27,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-17 00:44:27,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-17 00:44:28,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:28,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:28,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-17 00:44:29,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:29,361 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-17 00:44:29,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-17 00:44:30,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-17 00:44:30,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-17 00:44:31,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:31,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:44:32,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-17 00:44:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:32,807 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-17 00:44:33,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-17 00:44:33,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-17 00:44:34,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-17 00:44:34,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:35,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-17 00:44:35,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:35,624 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-17 00:44:35,625 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:35,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-17 00:44:35,625 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:35,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:35,631 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:35,636 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:35,636 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:35,642 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:35,647 [ scc.git] DEBUG Already up to date.
2024-12-17 00:44:35,647 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-17 00:44:37,667 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-17 00:44:37,667 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-17 00:44:37,671 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-17 00:44:39,103 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-17 00:44:39,103 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-17 00:44:39,109 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-17 00:44:39,664 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-17 00:44:39,665 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-17 00:44:39,669 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-17 00:44:39,953 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-17 00:44:39,954 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2024-12-17 00:44:39,958 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:39,959 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:39,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:39,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-17 00:44:39,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:39,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-17 00:44:40,068 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-17 00:44:40,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:40,072 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-17 00:44:40,072 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-17 00:44:40,072 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-17 00:44:40,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:40,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-17 00:44:40,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:40,234 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-17 00:44:40,579 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-17 00:44:40,580 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-17 00:44:40,580 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-17 00:44:40,580 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-17 00:44:40,580 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:40,585 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-17 00:44:40,585 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-17 00:44:40,585 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-17 00:44:40,585 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-17 00:44:40,585 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-17 00:44:40,585 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-17 00:44:40,585 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-17 00:44:40,585 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-17 00:44:40,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:40,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-17 00:44:40,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:40,743 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-17 00:44:40,848 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-17 00:44:40,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:40,852 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-17 00:44:40,852 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-17 00:44:40,852 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-17 00:44:41,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:41,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-17 00:44:41,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:41,138 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-17 00:44:41,219 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:41,229 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-17 00:44:41,229 [ scc.git] DEBUG package.json | 2 +-
2024-12-17 00:44:41,229 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-17 00:44:41,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:41,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:41,551 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:41,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:41,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:41,595 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:41,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec68304610> has no local changes
2024-12-17 00:44:41,604 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Generated by OMERO-plugins-push#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:41,670 [ scc.git] DEBUG [detached HEAD 5f7d039] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:41,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:41,671 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:42,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-17 00:44:42,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-17 00:44:43,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-17 00:44:43,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-17 00:44:44,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:44,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-17 00:44:45,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:45,247 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-17 00:44:45,247 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:45,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-17 00:44:45,247 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:45,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:45,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:45,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:45,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:45,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:45,270 [ scc.git] DEBUG Already up to date.
2024-12-17 00:44:45,270 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-17 00:44:45,593 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-17 00:44:45,593 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-17 00:44:45,597 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:45,597 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:45,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:45,603 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-17 00:44:45,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:45,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-17 00:44:45,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:44:45,626 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-17 00:44:45,626 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-17 00:44:45,626 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-17 00:44:45,627 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-17 00:44:45,627 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-17 00:44:45,627 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-17 00:44:45,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:45,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:45,808 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:45,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:45,814 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:45,853 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:45,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec68316bb0> has no local changes
2024-12-17 00:44:45,861 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:45,870 [ scc.git] DEBUG [detached HEAD dcb1ad4] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:45,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:45,870 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:46,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-17 00:44:46,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-17 00:44:47,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-17 00:44:47,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-17 00:44:48,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:48,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-17 00:44:49,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:49,066 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-17 00:44:49,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-17 00:44:50,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-17 00:44:50,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-17 00:44:51,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:44:51,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-17 00:44:51,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:44:51,950 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-17 00:44:51,950 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:51,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-17 00:44:51,950 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:51,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:51,956 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:51,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:51,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:51,971 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:51,979 [ scc.git] DEBUG Already up to date.
2024-12-17 00:44:51,979 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-17 00:44:52,303 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-17 00:44:52,304 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-17 00:44:52,308 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-17 00:44:53,209 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-17 00:44:53,209 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-17 00:44:53,213 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:53,213 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:53,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:53,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-17 00:44:53,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:53,231 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-17 00:44:53,441 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-17 00:44:53,441 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-17 00:44:53,441 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-17 00:44:53,441 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-17 00:44:53,441 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:44:53,442 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:44:53,448 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-17 00:44:53,454 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-17 00:44:53,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:53,595 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-17 00:44:53,602 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-17 00:44:53,667 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-12-17 00:44:53,674 [ scc.config] DEBUG Found github.token
2024-12-17 00:44:53,674 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-17 00:44:53,674 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-17 00:44:53,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:53,685 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-17 00:44:53,875 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-17 00:44:53,875 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-17 00:44:53,875 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-17 00:44:53,875 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:44:53,876 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:44:53,882 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-17 00:44:53,890 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-17 00:44:54,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:44:54,030 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-17 00:44:54,037 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-17 00:44:54,042 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-17 00:44:54,047 [ scc.config] DEBUG Found github.token
2024-12-17 00:44:54,047 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-17 00:44:54,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:54,084 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:54,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:54,089 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:54,126 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:54,133 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682be880> has no local changes
2024-12-17 00:44:54,133 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:54,141 [ scc.git] DEBUG [detached HEAD 27a728a] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:54,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:54,141 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:54,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-17 00:44:55,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-17 00:44:55,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-17 00:44:55,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-17 00:44:56,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-17 00:44:56,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-17 00:44:57,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-17 00:44:57,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-17 00:44:57,931 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:57,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-17 00:44:57,931 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:57,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:57,937 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:57,942 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:57,942 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:57,948 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:57,953 [ scc.git] DEBUG Already up to date.
2024-12-17 00:44:57,953 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:57,953 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:57,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:57,957 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:58,038 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:58,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:58,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:58,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:58,090 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682be670> has no local changes
2024-12-17 00:44:58,090 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:58,098 [ scc.git] DEBUG [detached HEAD 3ad01a4] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:58,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:58,099 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:58,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2024-12-17 00:44:58,334 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:44:58,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-17 00:44:58,334 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:58,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:58,341 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:44:58,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:44:58,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:44:58,352 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:44:58,361 [ scc.git] DEBUG Updating 18bccb6..eb47378
2024-12-17 00:44:58,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls/15 HTTP/1.1" 200 None
2024-12-17 00:44:58,956 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:44:58,956 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:58,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:58,962 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:44:59,001 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:44:59,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:44:59,007 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:44:59,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:44:59,053 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6832bd60> has no local changes
2024-12-17 00:44:59,053 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Updating 18bccb6..eb47378
Previously merged:
- PR 15 jburel 'Build'
Generated by OMERO-plugins-push#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:44:59,061 [ scc.git] DEBUG [detached HEAD bca206c] merge master -Dorg -Ssuccess-only
2024-12-17 00:44:59,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:44:59,061 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:44:59,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-17 00:45:00,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-17 00:45:00,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-17 00:45:01,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-17 00:45:01,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-17 00:45:02,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:02,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-17 00:45:03,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:03,047 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-17 00:45:03,047 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:03,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-17 00:45:03,047 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:03,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:03,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:03,057 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:03,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:03,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:03,073 [ scc.git] DEBUG Updating 5c752d5..7c7ed9a
2024-12-17 00:45:03,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls/29 HTTP/1.1" 200 None
2024-12-17 00:45:03,675 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-17 00:45:04,088 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-17 00:45:04,089 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-17 00:45:04,093 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:04,093 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:04,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:04,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-17 00:45:04,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:04,110 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-17 00:45:04,120 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-17 00:45:04,122 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:45:04,124 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-17 00:45:04,124 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-17 00:45:04,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:04,336 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:04,382 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:04,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:04,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:04,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:04,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682ea730> has no local changes
2024-12-17 00:45:04,431 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 5c752d5..7c7ed9a
Previously merged:
- PR 29 jburel 'Build'
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:04,438 [ scc.git] DEBUG [detached HEAD 7f20830] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:04,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:04,439 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:04,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-17 00:45:05,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-17 00:45:05,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-17 00:45:06,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-17 00:45:06,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:07,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-17 00:45:07,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:07,803 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-17 00:45:07,804 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:07,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-17 00:45:07,804 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:07,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:07,809 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:07,815 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:07,815 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:07,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:07,828 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:07,828 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-17 00:45:08,236 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-17 00:45:08,236 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-17 00:45:08,240 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:08,240 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:08,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:08,246 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-17 00:45:08,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:08,256 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-17 00:45:08,320 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG Auto-merging setup.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-17 00:45:08,320 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:45:08,320 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:45:08,326 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-17 00:45:08,335 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2024-12-17 00:45:08,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:08,478 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-17 00:45:08,484 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2024-12-17 00:45:08,490 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2024-12-17 00:45:08,494 [ scc.config] DEBUG Found github.token
2024-12-17 00:45:08,495 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-17 00:45:08,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:08,534 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:08,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:08,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:08,578 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:08,584 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682ea610> has no local changes
2024-12-17 00:45:08,584 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:08,592 [ scc.git] DEBUG [detached HEAD 0d80113] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:08,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:08,593 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:09,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-17 00:45:09,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-17 00:45:10,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-17 00:45:10,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-17 00:45:11,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:11,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:45:12,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-17 00:45:12,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-17 00:45:13,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-17 00:45:13,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-17 00:45:14,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-17 00:45:14,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:14,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-17 00:45:15,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:15,378 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-17 00:45:15,378 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:15,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-17 00:45:15,379 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:15,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:15,385 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:15,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:15,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:15,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:15,400 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:15,400 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-17 00:45:15,907 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-17 00:45:15,908 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-17 00:45:15,912 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:15,913 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:15,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:15,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-17 00:45:15,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:15,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-17 00:45:15,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-17 00:45:15,968 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-17 00:45:15,970 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-17 00:45:15,971 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-17 00:45:15,971 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-17 00:45:15,971 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-17 00:45:15,971 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-17 00:45:16,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:16,127 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:16,166 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:16,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:16,171 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:16,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:16,217 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682ddc70> has no local changes
2024-12-17 00:45:16,218 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:16,225 [ scc.git] DEBUG [detached HEAD 62f0ee7] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:16,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:16,226 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:16,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-17 00:45:16,559 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:16,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-17 00:45:16,559 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:16,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:16,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:16,569 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:16,570 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:16,575 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:16,580 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:16,581 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:16,581 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:16,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:16,585 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:16,625 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:16,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:16,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:16,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:16,676 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec68300f40> has no local changes
2024-12-17 00:45:16,676 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:16,685 [ scc.git] DEBUG [detached HEAD b5aee55] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:16,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:16,685 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:17,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-17 00:45:17,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-17 00:45:18,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2024-12-17 00:45:18,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-17 00:45:19,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:19,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:45:20,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-17 00:45:20,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:20,474 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-17 00:45:20,474 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:20,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-17 00:45:20,474 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:20,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:20,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:20,484 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:20,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:20,490 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:20,496 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:20,496 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-17 00:45:21,236 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-17 00:45:21,236 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-17 00:45:21,241 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:21,241 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:21,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:21,246 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-17 00:45:21,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:21,256 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-17 00:45:21,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:45:21,335 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-17 00:45:21,336 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-17 00:45:21,336 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-17 00:45:21,336 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-17 00:45:21,336 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-17 00:45:21,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:21,471 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:21,510 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:21,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:21,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:21,552 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:21,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682c3f70> has no local changes
2024-12-17 00:45:21,559 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:21,567 [ scc.git] DEBUG [detached HEAD 180266a] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:21,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:21,567 [ scc.git] INFO Overriding base-branch from master to main
2024-12-17 00:45:21,567 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:21,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-17 00:45:22,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-17 00:45:22,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-17 00:45:23,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-17 00:45:24,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:24,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:45:24,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-17 00:45:25,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-17 00:45:25,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-17 00:45:26,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-17 00:45:26,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:27,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-17 00:45:27,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:27,847 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-17 00:45:27,848 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:27,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-17 00:45:27,848 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:27,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:27,854 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-17 00:45:27,859 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:27,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-17 00:45:27,864 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-17 00:45:27,874 [ scc.git] DEBUG Updating 67bb245..8f3c313
2024-12-17 00:45:28,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls/17 HTTP/1.1" 200 None
2024-12-17 00:45:28,507 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-17 00:45:28,811 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-17 00:45:28,811 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-17 00:45:28,815 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:28,815 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:28,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:28,821 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-17 00:45:28,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:28,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-17 00:45:28,840 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-17 00:45:28,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-17 00:45:28,840 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:45:28,840 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:45:28,846 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-17 00:45:28,851 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2024-12-17 00:45:28,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:28,991 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-17 00:45:28,997 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2024-12-17 00:45:29,003 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-17 00:45:29,007 [ scc.config] DEBUG Found github.token
2024-12-17 00:45:29,007 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-17 00:45:29,007 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:29,045 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,051 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:29,089 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:29,095 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6825baf0> has no local changes
2024-12-17 00:45:29,096 [ 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)
Updating 67bb245..8f3c313
Previously merged:
- PR 17 jburel 'Build'
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:29,103 [ scc.git] DEBUG [detached HEAD 4dff03e] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:29,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:29,103 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:29,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-17 00:45:29,418 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:29,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-17 00:45:29,418 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:29,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:29,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:29,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:29,439 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:29,439 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:29,439 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,444 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:29,535 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:29,579 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:29,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6825ba30> has no local changes
2024-12-17 00:45:29,586 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:29,593 [ scc.git] DEBUG [detached HEAD d6952b3] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:29,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:29,594 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:29,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-17 00:45:29,843 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:29,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-17 00:45:29,843 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,849 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:29,855 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:29,855 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:29,861 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:29,867 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:29,868 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:29,868 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,872 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:29,913 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:29,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:29,918 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:29,959 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:29,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682028b0> has no local changes
2024-12-17 00:45:29,966 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:29,974 [ scc.git] DEBUG [detached HEAD 8e7d449] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:29,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:29,974 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:30,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-17 00:45:30,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-17 00:45:31,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-17 00:45:31,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-17 00:45:32,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:32,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-17 00:45:33,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:33,110 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-17 00:45:33,110 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:33,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-17 00:45:33,111 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:33,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:33,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-17 00:45:33,121 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:33,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-17 00:45:33,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-17 00:45:33,131 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:33,132 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-17 00:45:33,632 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-17 00:45:33,632 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-17 00:45:33,637 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:33,637 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:33,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:33,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-17 00:45:33,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:33,653 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-17 00:45:33,808 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-17 00:45:33,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-17 00:45:33,809 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:45:33,810 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:45:33,816 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-17 00:45:33,823 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-17 00:45:33,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:33,966 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-17 00:45:33,972 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-17 00:45:33,977 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-17 00:45:33,981 [ scc.config] DEBUG Found github.token
2024-12-17 00:45:33,981 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-17 00:45:33,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:34,019 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:34,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:34,025 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:34,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:34,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec682025b0> has no local changes
2024-12-17 00:45:34,071 [ 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:34,078 [ scc.git] DEBUG [detached HEAD 8a52f20] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:34,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:34,079 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-17 00:45:34,079 [ scc.repo] DEBUG ## PRs found:
2024-12-17 00:45:34,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-17 00:45:35,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-17 00:45:35,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-17 00:45:35,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-17 00:45:36,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:36,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-17 00:45:37,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-17 00:45:37,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:37,748 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-17 00:45:38,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-17 00:45:38,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-17 00:45:39,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-17 00:45:39,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-17 00:45:40,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-17 00:45:40,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-17 00:45:41,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-17 00:45:41,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-17 00:45:42,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-17 00:45:42,009 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-17 00:45:42,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-17 00:45:42,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-17 00:45:43,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-17 00:45:43,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-17 00:45:43,992 [ scc.repo] DEBUG ## Branches found:
2024-12-17 00:45:43,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-17 00:45:43,992 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:43,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:43,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-17 00:45:44,005 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-17 00:45:44,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-17 00:45:44,013 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-17 00:45:44,020 [ scc.git] DEBUG Already up to date.
2024-12-17 00:45:44,021 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-17 00:45:44,419 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-17 00:45:44,419 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-17 00:45:44,424 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-17 00:45:44,769 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-17 00:45:44,770 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-17 00:45:44,774 [ scc.git] DEBUG ## Unique users: []
2024-12-17 00:45:44,774 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:44,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:44,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-17 00:45:44,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:44,794 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-17 00:45:44,806 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-17 00:45:44,806 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-17 00:45:44,806 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-17 00:45:44,807 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-17 00:45:44,814 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-17 00:45:44,820 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-17 00:45:44,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:44,968 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-17 00:45:44,976 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-17 00:45:44,981 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#281](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-17 00:45:44,986 [ scc.config] DEBUG Found github.token
2024-12-17 00:45:44,986 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-17 00:45:44,987 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-17 00:45:44,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:44,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-17 00:45:45,008 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-17 00:45:45,010 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-17 00:45:45,010 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-17 00:45:45,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:45,372 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-17 00:45:45,415 [ scc.git] DEBUG Get sha1 of %s
2024-12-17 00:45:45,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-17 00:45:45,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:45,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:45,472 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6827bf10> has no local changes
2024-12-17 00:45:45,472 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:45,483 [ scc.git] DEBUG [detached HEAD 9c2fd23] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:45,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:45,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-17 00:45:45,559 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-17 00:45:45,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:45,772 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-17 00:45:45,781 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-17 00:45:46,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:46,165 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-17 00:45:46,170 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-17 00:45:46,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:46,557 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-17 00:45:46,561 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-17 00:45:46,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:46,967 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-17 00:45:47,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:47,354 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-17 00:45:47,359 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-17 00:45:47,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:47,749 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-17 00:45:47,753 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-17 00:45:48,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:48,150 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-17 00:45:48,154 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-17 00:45:48,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:48,540 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-17 00:45:48,544 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-17 00:45:48,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:48,937 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-17 00:45:48,942 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-17 00:45:49,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:49,326 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-17 00:45:49,330 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-17 00:45:49,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:49,734 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-17 00:45:49,739 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-17 00:45:50,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:50,156 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-17 00:45:50,161 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-17 00:45:50,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:50,547 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-17 00:45:50,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:50,932 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-17 00:45:51,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:51,325 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-17 00:45:51,330 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-17 00:45:51,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:51,727 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-17 00:45:52,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:52,122 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-17 00:45:52,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:52,501 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-17 00:45:52,505 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-17 00:45:52,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:52,892 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-17 00:45:52,897 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-17 00:45:53,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:53,280 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-17 00:45:53,286 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-17 00:45:53,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:53,683 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-17 00:45:53,687 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-17 00:45:54,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-17 00:45:54,079 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-17 00:45:54,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-17 00:45:54,157 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fec6dfc5ee0> has local changes
2024-12-17 00:45:54,157 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
- PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Updating 18bccb6..eb47378
Previously merged:
- PR 15 jburel 'Build'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 5c752d5..7c7ed9a
Previously merged:
- PR 29 jburel 'Build'
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 67bb245..8f3c313
Previously merged:
- PR 17 jburel 'Build'
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 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- 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#281 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/281/)'
2024-12-17 00:45:54,466 [ scc.git] DEBUG [detached HEAD 77684c3] merge master -Dorg -Ssuccess-only
2024-12-17 00:45:54,466 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-17 00:45:54,466 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-17 00:45:54,466 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,466 [ scc.merge] INFO
2024-12-17 00:45:54,466 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,466 [ scc.merge] INFO - PR 423 dependabot[bot] 'Bump omero-figure from `1dfb138` to `fb316a7`'
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 424 dependabot[bot] 'Bump omero-signup from `c8610db` to `be76813`'
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-17 00:45:54,467 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-17 00:45:54,467 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-17 00:45:54,467 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-17 00:45:54,467 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-17 00:45:54,467 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-17 00:45:54,467 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-17 00:45:54,467 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-17 00:45:54,467 [ scc.merge] INFO
2024-12-17 00:45:54,467 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-17 00:45:54,467 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-17 00:45:54,467 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-17 00:45:54,468 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-17 00:45:54,468 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-17 00:45:54,468 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-17 00:45:54,468 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-17 00:45:54,468 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,468 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-17 00:45:54,468 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-17 00:45:54,468 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-17 00:45:54,469 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-17 00:45:54,469 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-17 00:45:54,469 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-17 00:45:54,469 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-17 00:45:54,469 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-17 00:45:54,469 [ scc.merge] INFO Updating 18bccb6..eb47378
2024-12-17 00:45:54,469 [ scc.merge] INFO Previously merged:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 15 jburel 'Build'
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-17 00:45:54,469 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-17 00:45:54,469 [ scc.merge] INFO Updating 5c752d5..7c7ed9a
2024-12-17 00:45:54,469 [ scc.merge] INFO Previously merged:
2024-12-17 00:45:54,469 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-17 00:45:54,469 [ scc.merge] INFO
2024-12-17 00:45:54,469 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-17 00:45:54,470 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-17 00:45:54,470 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-17 00:45:54,470 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-17 00:45:54,470 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-17 00:45:54,470 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-17 00:45:54,470 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-17 00:45:54,470 [ scc.merge] INFO Updating 67bb245..8f3c313
2024-12-17 00:45:54,470 [ scc.merge] INFO Previously merged:
2024-12-17 00:45:54,470 [ scc.merge] INFO - PR 17 jburel 'Build'
2024-12-17 00:45:54,470 [ scc.merge] INFO
2024-12-17 00:45:54,470 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-17 00:45:54,471 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-17 00:45:54,471 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-17 00:45:54,471 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Repository: ome/scripts
2024-12-17 00:45:54,471 [ scc.merge] INFO Excluded PRs:
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-17 00:45:54,471 [ scc.merge] INFO Already up to date.
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Merged PRs:
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-17 00:45:54,471 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-17 00:45:54,471 [ scc.merge] INFO
2024-12-17 00:45:54,471 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-17 00:45:54,471 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-17 00:45:54,477 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-17 00:45:54,482 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-17 00:45:54,486 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-17 00:45:54,491 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-17 00:45:54,496 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-17 00:45:54,500 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-17 00:45:54,505 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-17 00:45:54,509 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-17 00:45:54,514 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-17 00:45:54,519 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-17 00:45:54,523 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-17 00:45:54,528 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-17 00:45:54,533 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-17 00:45:54,537 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-17 00:45:54,542 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-17 00:45:54,547 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-17 00:45:54,551 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-17 00:45:54,556 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-17 00:45:54,561 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-17 00:45:54,565 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-17 00:45:54,570 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-17 00:45:54,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-17 00:45:54,575 [ scc.git] DEBUG Calling 'git remote'
2024-12-17 00:45:54,579 [ 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 06ac452] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fb316a7e
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
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 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD a508fb4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-17 00:46:41,964 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-17 00:46:50,895 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-17 00:46:53,255 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-17 00:46:57,760 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-17 00:47:39,142 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/4f42acd4/images/svgs/logo.svg){kind=logo}
