Console Output
Skipping 89 KB..
Full Logf04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-14 00:43:42,193 [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-14 00:43:42,668 [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-14 00:43:43,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-14 00:43:43,505 [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-14 00:43:43,506 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-14 00:43:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-14 00:43:43,961 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-14 00:43:44,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-14 00:43:44,993 [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-14 00:43:45,477 [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-14 00:43:46,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-14 00:43:46,419 [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-14 00:43:46,419 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-14 00:43:46,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-14 00:43:47,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-14 00:43:47,381 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-14 00:43:47,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-14 00:43:48,433 [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-14 00:43:48,959 [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-14 00:43:49,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-14 00:43:49,906 [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-14 00:43:49,907 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-14 00:43:50,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-14 00:43:50,546 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-14 00:43:51,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-14 00:43:51,615 [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-14 00:43:52,140 [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-14 00:43:52,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-14 00:43:53,073 [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-14 00:43:53,074 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-14 00:43:53,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-14 00:43:53,553 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-14 00:43:54,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-14 00:43:54,646 [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-14 00:43:55,108 [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-14 00:43:55,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-14 00:43:56,043 [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-14 00:43:56,044 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-14 00:43:56,044 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:43:56,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-14 00:43:56,044 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:43:56,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:56,050 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:43:56,055 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:43:56,055 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:43:56,060 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:43:56,065 [ scc.git] DEBUG Already up to date.
2024-12-14 00:43:56,065 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-14 00:43:56,392 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:56,393 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-14 00:43:56,397 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-14 00:43:56,678 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:56,678 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-14 00:43:56,682 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-14 00:43:56,967 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:56,968 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-14 00:43:56,972 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-14 00:43:57,252 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:57,252 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-14 00:43:57,256 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-14 00:43:57,555 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:57,555 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-14 00:43:57,559 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-14 00:43:57,844 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-14 00:43:57,844 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-14 00:43:57,849 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:43:57,849 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:43:57,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:57,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-14 00:43:57,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:57,876 [ 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-14 00:43:57,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:43:57,951 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-14 00:43:57,951 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-14 00:43:58,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:43:58,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-14 00:43:58,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:58,152 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-14 00:43:58,285 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-14 00:43:58,286 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:43:58,291 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-14 00:43:58,291 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-14 00:43:58,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:43:58,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-14 00:43:58,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:58,505 [ 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-14 00:43:58,642 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-14 00:43:58,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-14 00:43:58,643 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:43:58,643 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:43:58,650 [ scc.git] DEBUG Calling 'git reset --hard 133dad8edcdc9de7255b339ffdd37bd3f1baebd2'
2024-12-14 00:43:58,657 [ scc.git] DEBUG HEAD is now at 133dad8 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-14 00:43:58,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:43:58,886 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-14 00:43:58,892 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-14 00:43:58,898 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/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-14 00:43:58,903 [ scc.config] DEBUG Found github.token
2024-12-14 00:43:58,903 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-14 00:43:58,903 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-14 00:43:58,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:58,966 [ 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-14 00:43:59,094 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-14 00:43:59,094 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:43:59,099 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-14 00:43:59,099 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-14 00:43:59,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:43:59,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-14 00:43:59,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:59,288 [ 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-14 00:43:59,401 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-14 00:43:59,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:43:59,407 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-14 00:43:59,407 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-14 00:43:59,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:43:59,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-14 00:43:59,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:43:59,671 [ 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-14 00:43:59,691 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-14 00:43:59,691 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-14 00:43:59,691 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:43:59,691 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:43:59,698 [ scc.git] DEBUG Calling 'git reset --hard b6d067b6b796fe4441a68ab1bb7046e564a938f8'
2024-12-14 00:43:59,705 [ scc.git] DEBUG HEAD is now at b6d067b merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-14 00:44:00,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:00,042 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-14 00:44:00,050 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-14 00:44:00,055 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/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-14 00:44:00,061 [ scc.config] DEBUG Found github.token
2024-12-14 00:44:00,062 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-14 00:44:00,860 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-14 00:44:00,861 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:00,901 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:00,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:00,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:00,946 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:00,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa077027f40> has no local changes
2024-12-14 00:44:00,954 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:00,962 [ scc.git] DEBUG [detached HEAD ed6902f] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:00,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:00,963 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:01,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-14 00:44:02,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2024-12-14 00:44:02,008 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-14 00:44:02,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-14 00:44:03,050 [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-14 00:44:03,603 [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-14 00:44:04,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2024-12-14 00:44:04,615 [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-14 00:44:04,616 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-14 00:44:05,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-14 00:44:05,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-14 00:44:06,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-14 00:44:06,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-14 00:44:07,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-14 00:44:07,520 [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-14 00:44:08,019 [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-14 00:44:08,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-14 00:44:08,909 [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-14 00:44:08,910 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-14 00:44:09,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-14 00:44:09,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-14 00:44:10,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-14 00:44:10,945 [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-14 00:44:11,453 [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-14 00:44:11,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-14 00:44:12,385 [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-14 00:44:12,386 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-14 00:44:12,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-14 00:44:13,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-14 00:44:13,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-14 00:44:14,338 [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-14 00:44:14,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-14 00:44:15,263 [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-14 00:44:15,264 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-14 00:44:15,264 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:15,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-14 00:44:15,265 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:15,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:15,271 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:15,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:15,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:15,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:15,288 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:15,289 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-14 00:44:15,591 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-14 00:44:15,592 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-14 00:44:15,596 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-14 00:44:17,592 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-14 00:44:17,592 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-14 00:44:17,597 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-14 00:44:18,094 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-14 00:44:18,094 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-14 00:44:18,099 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2024-12-14 00:44:18,382 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-14 00:44:18,382 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2024-12-14 00:44:18,387 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:18,387 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:18,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:18,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-14 00:44:18,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:18,407 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-14 00:44:18,430 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-14 00:44:18,431 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:18,435 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-14 00:44:18,435 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-14 00:44:18,435 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-14 00:44:18,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:18,578 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-14 00:44:18,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:18,594 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-14 00:44:18,759 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-14 00:44:18,759 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-14 00:44:18,759 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-14 00:44:18,759 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-14 00:44:18,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:18,764 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-14 00:44:18,764 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-14 00:44:18,764 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-14 00:44:18,764 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-14 00:44:18,765 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-14 00:44:18,765 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-14 00:44:18,765 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-14 00:44:18,765 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-14 00:44:18,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:18,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-14 00:44:18,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:18,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-14 00:44:19,001 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-14 00:44:19,002 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:19,005 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-14 00:44:19,005 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-14 00:44:19,005 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-14 00:44:19,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:19,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-14 00:44:19,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:19,398 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2024-12-14 00:44:19,436 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:19,446 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2024-12-14 00:44:19,446 [ scc.git] DEBUG package.json | 2 +-
2024-12-14 00:44:19,446 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2024-12-14 00:44:19,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:19,735 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:19,775 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:19,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:19,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:19,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:19,828 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa074783610> has no local changes
2024-12-14 00:44:19,828 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:19,839 [ scc.git] DEBUG [detached HEAD aa9929d] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:19,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:19,840 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:20,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-14 00:44:20,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-14 00:44:21,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-14 00:44:21,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-14 00:44:22,367 [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-14 00:44:22,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-14 00:44:23,353 [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-14 00:44:23,353 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-14 00:44:23,354 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:23,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-14 00:44:23,354 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:23,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:23,360 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:23,365 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:23,365 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:23,370 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:23,376 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:23,376 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-14 00:44:23,682 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-14 00:44:23,682 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-14 00:44:23,687 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:23,687 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:23,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:23,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-14 00:44:23,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:23,703 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-14 00:44:23,713 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:23,716 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-14 00:44:23,716 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-14 00:44:23,716 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-14 00:44:23,716 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-14 00:44:23,716 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-14 00:44:23,716 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-14 00:44:23,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:23,852 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:23,894 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:23,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:23,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:23,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:23,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa074796bb0> has no local changes
2024-12-14 00:44:23,961 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:23,972 [ scc.git] DEBUG [detached HEAD 1b60fd6] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:23,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:23,972 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:24,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-14 00:44:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-14 00:44:25,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-14 00:44:25,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-14 00:44:26,324 [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-14 00:44:26,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-14 00:44:27,203 [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-14 00:44:27,203 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-14 00:44:27,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-14 00:44:28,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-14 00:44:28,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-14 00:44:29,095 [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-14 00:44:29,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-14 00:44:30,057 [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-14 00:44:30,058 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-14 00:44:30,058 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:30,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-14 00:44:30,058 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:30,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:30,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:30,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:30,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:30,076 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:30,082 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:30,083 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-14 00:44:30,790 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-14 00:44:30,790 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-14 00:44:30,795 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-14 00:44:31,817 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-14 00:44:31,817 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-14 00:44:31,822 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:31,822 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:31,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:31,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-14 00:44:31,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:31,838 [ 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-14 00:44:31,853 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-14 00:44:31,853 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-14 00:44:31,853 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-14 00:44:31,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-14 00:44:31,854 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:44:31,854 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:44:31,859 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-14 00:44:31,866 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-14 00:44:32,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:32,010 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-14 00:44:32,018 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-14 00:44:32,084 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-12-14 00:44:32,089 [ scc.config] DEBUG Found github.token
2024-12-14 00:44:32,089 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-14 00:44:32,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-14 00:44:32,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:32,101 [ 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-14 00:44:32,117 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-14 00:44:32,117 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-14 00:44:32,117 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-14 00:44:32,117 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:44:32,117 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:44:32,124 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-14 00:44:32,131 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-14 00:44:32,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:32,398 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-14 00:44:32,405 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-14 00:44:32,411 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/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-14 00:44:32,415 [ scc.config] DEBUG Found github.token
2024-12-14 00:44:32,415 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-14 00:44:32,416 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:32,456 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:32,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:32,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:32,502 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:32,509 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07473e8b0> has no local changes
2024-12-14 00:44:32,509 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:32,519 [ scc.git] DEBUG [detached HEAD a0c8bd5] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:32,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:32,520 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:32,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-14 00:44:33,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2024-12-14 00:44:33,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-14 00:44:34,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-14 00:44:34,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-14 00:44:35,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-14 00:44:35,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-14 00:44:36,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-14 00:44:36,381 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:36,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-14 00:44:36,382 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:36,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:36,387 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:36,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:36,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:36,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:36,402 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:36,402 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:36,402 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:36,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:36,406 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:36,444 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:36,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:36,449 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:36,486 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:36,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07473e6a0> has no local changes
2024-12-14 00:44:36,492 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:36,501 [ scc.git] DEBUG [detached HEAD 84c921e] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:36,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:36,501 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:36,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-12-14 00:44:37,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-12-14 00:44:37,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-12-14 00:44:38,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-14 00:44:38,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-14 00:44:39,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-12-14 00:44:39,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-14 00:44:40,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-14 00:44:40,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-14 00:44:41,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-12-14 00:44:41,281 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-12-14 00:44:41,281 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:41,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-14 00:44:41,281 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:41,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:41,287 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:41,292 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:41,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:41,297 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:41,302 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:41,302 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-14 00:44:41,607 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-12-14 00:44:41,607 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-14 00:44:41,611 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:41,611 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:41,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:41,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-14 00:44:41,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:41,626 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-14 00:44:41,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:41,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:41,777 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:41,817 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:41,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:41,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:41,863 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:41,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0747add00> has no local changes
2024-12-14 00:44:41,869 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:41,877 [ scc.git] DEBUG [detached HEAD 0f535fa] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:41,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:41,877 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:42,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-14 00:44:42,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-12-14 00:44:43,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-14 00:44:43,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-14 00:44:44,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-14 00:44:44,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24?per_page=1 HTTP/1.1" 200 None
2024-12-14 00:44:45,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-14 00:44:45,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-12-14 00:44:45,747 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-12-14 00:44:46,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-14 00:44:46,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-14 00:44:47,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-14 00:44:47,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-14 00:44:48,209 [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-14 00:44:48,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-14 00:44:49,028 [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-14 00:44:49,028 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-14 00:44:49,028 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:49,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-14 00:44:49,029 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:49,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:49,034 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:49,039 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:49,039 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:49,044 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:49,049 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:49,049 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-14 00:44:49,493 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-14 00:44:49,493 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-14 00:44:49,498 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-12-14 00:44:50,086 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-14 00:44:50,086 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-12-14 00:44:50,091 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:50,091 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:50,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:50,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-14 00:44:50,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:50,107 [ 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-14 00:44:50,117 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-14 00:44:50,118 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:50,121 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-14 00:44:50,121 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-14 00:44:50,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:50,266 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-14 00:44:50,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:50,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-14 00:44:50,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:50,291 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-14 00:44:50,291 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-14 00:44:50,291 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-12-14 00:44:50,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:50,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:50,704 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:50,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:50,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:50,746 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:50,752 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07476f100> has no local changes
2024-12-14 00:44:50,752 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Generated by OMERO-plugins-push#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:50,760 [ scc.git] DEBUG [detached HEAD 9bb90fc] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:50,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:50,761 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:51,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-14 00:44:51,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-12-14 00:44:52,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-14 00:44:52,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-14 00:44:53,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-14 00:44:53,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-14 00:44:53,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1?per_page=1 HTTP/1.1" 200 2
2024-12-14 00:44:53,973 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-12-14 00:44:54,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-14 00:44:54,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-14 00:44:55,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-14 00:44:55,915 [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-14 00:44:56,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-14 00:44:56,773 [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-14 00:44:56,774 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-14 00:44:56,774 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:44:56,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-14 00:44:56,774 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:56,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:56,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:44:56,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:44:56,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:44:56,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:44:56,796 [ scc.git] DEBUG Already up to date.
2024-12-14 00:44:56,796 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-14 00:44:57,439 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-14 00:44:57,439 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-14 00:44:57,443 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-12-14 00:44:58,278 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-14 00:44:58,278 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-12-14 00:44:58,283 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:44:58,283 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:58,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:58,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-14 00:44:58,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:58,300 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-14 00:44:58,347 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG Auto-merging setup.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-14 00:44:58,347 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:44:58,348 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:44:58,354 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-14 00:44:58,361 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-12-14 00:44:58,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:58,506 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-14 00:44:58,512 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-14 00:44:58,518 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-12-14 00:44:58,522 [ scc.config] DEBUG Found github.token
2024-12-14 00:44:58,522 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-14 00:44:58,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-14 00:44:58,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:58,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-14 00:44:58,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:44:58,547 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-14 00:44:58,547 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-14 00:44:58,547 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-14 00:44:58,547 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-14 00:44:58,548 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-14 00:44:58,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:44:58,887 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:44:58,925 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:44:58,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:44:58,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:44:58,969 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:44:58,976 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07476f310> has no local changes
2024-12-14 00:44:58,976 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:44:58,985 [ scc.git] DEBUG [detached HEAD 0c3cbe7] merge master -Dorg -Ssuccess-only
2024-12-14 00:44:58,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:44:58,986 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:44:59,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-14 00:44:59,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2024-12-14 00:45:00,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2024-12-14 00:45:01,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2024-12-14 00:45:01,548 [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-14 00:45:02,012 [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-14 00:45:02,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2024-12-14 00:45:02,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2024-12-14 00:45:03,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-14 00:45:03,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-14 00:45:04,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-14 00:45:04,848 [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-14 00:45:05,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-14 00:45:05,704 [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-14 00:45:05,705 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-14 00:45:05,705 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:05,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-14 00:45:05,705 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:05,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:05,712 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:05,717 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:05,717 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:05,722 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:05,728 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:05,728 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-14 00:45:06,055 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-14 00:45:06,055 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-14 00:45:06,060 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:06,060 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:06,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-14 00:45:06,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,077 [ 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-14 00:45:06,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-14 00:45:06,094 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-14 00:45:06,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-14 00:45:06,097 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-14 00:45:06,097 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-14 00:45:06,097 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-14 00:45:06,097 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-14 00:45:06,097 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-14 00:45:06,097 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-14 00:45:06,097 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-14 00:45:06,098 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-14 00:45:06,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:06,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:06,277 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:06,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:06,326 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:06,333 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07476aca0> has no local changes
2024-12-14 00:45:06,333 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:06,344 [ scc.git] DEBUG [detached HEAD 9c1952d] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:06,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:06,344 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:06,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-14 00:45:06,643 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:06,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-14 00:45:06,643 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:06,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:06,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:06,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:06,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:06,666 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:06,666 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:06,667 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:06,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,672 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:06,719 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:06,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:06,725 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:06,766 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:06,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0746cb430> has no local changes
2024-12-14 00:45:06,773 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:06,782 [ scc.git] DEBUG [detached HEAD 2a37114] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:06,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:06,782 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:07,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-14 00:45:07,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-14 00:45:08,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-14 00:45:08,626 [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-14 00:45:09,087 [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-14 00:45:09,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-14 00:45:09,941 [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-14 00:45:09,942 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-14 00:45:09,942 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:09,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-14 00:45:09,942 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:09,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:09,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:09,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:09,954 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:09,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:09,965 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:09,965 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-14 00:45:10,288 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-14 00:45:10,288 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-14 00:45:10,293 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:10,293 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:10,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:10,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-14 00:45:10,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:10,309 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-14 00:45:10,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:45:10,320 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-14 00:45:10,320 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-14 00:45:10,320 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-14 00:45:10,320 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-14 00:45:10,320 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-14 00:45:10,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:10,463 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:10,506 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:10,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:10,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:10,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:10,561 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0746cbf70> has no local changes
2024-12-14 00:45:10,561 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:10,570 [ scc.git] DEBUG [detached HEAD 24307ce] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:10,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:10,570 [ scc.git] INFO Overriding base-branch from master to main
2024-12-14 00:45:10,571 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:11,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-14 00:45:11,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-14 00:45:11,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-14 00:45:12,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-14 00:45:12,995 [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-14 00:45:13,502 [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-14 00:45:13,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-12-14 00:45:14,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-12-14 00:45:14,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-12-14 00:45:15,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-14 00:45:15,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-14 00:45:16,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-14 00:45:16,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-14 00:45:17,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-14 00:45:17,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-14 00:45:18,280 [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-14 00:45:18,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-14 00:45:19,170 [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-14 00:45:19,171 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-14 00:45:19,171 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:19,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-14 00:45:19,171 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:19,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:19,177 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-14 00:45:19,182 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:19,182 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-14 00:45:19,187 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-14 00:45:19,192 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:19,193 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-14 00:45:19,526 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-14 00:45:19,526 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-14 00:45:19,531 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:19,531 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:19,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:19,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-14 00:45:19,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:19,548 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-14 00:45:19,558 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-14 00:45:19,558 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-14 00:45:19,558 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:45:19,558 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:45:19,564 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-14 00:45:19,570 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-12-14 00:45:19,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:19,712 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-14 00:45:19,719 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-14 00:45:19,724 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-14 00:45:19,728 [ scc.config] DEBUG Found github.token
2024-12-14 00:45:19,728 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-14 00:45:19,728 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:19,768 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:19,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:19,774 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:19,821 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:19,829 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0746cb490> has no local changes
2024-12-14 00:45:19,829 [ 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 17 jburel 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:19,838 [ scc.git] DEBUG [detached HEAD 423c909] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:19,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:19,839 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:20,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-14 00:45:20,121 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:20,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-14 00:45:20,122 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,127 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:20,132 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:20,132 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:20,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:20,142 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:20,142 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:20,142 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,147 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:20,188 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,193 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:20,229 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:20,236 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0746dcc10> has no local changes
2024-12-14 00:45:20,236 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:20,243 [ scc.git] DEBUG [detached HEAD e97a786] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:20,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:20,244 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:20,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-14 00:45:20,531 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:20,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-14 00:45:20,531 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:20,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:20,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:20,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:20,552 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:20,552 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:20,552 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,557 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:20,597 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:20,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:20,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:20,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:20,650 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa074682970> has no local changes
2024-12-14 00:45:20,650 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:20,659 [ scc.git] DEBUG [detached HEAD 35e6d65] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:20,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:20,659 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:21,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-14 00:45:21,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-14 00:45:21,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-14 00:45:22,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-14 00:45:22,908 [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-14 00:45:23,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-14 00:45:23,820 [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-14 00:45:23,820 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-14 00:45:23,821 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:23,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-14 00:45:23,821 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:23,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:23,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-14 00:45:23,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:23,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-14 00:45:23,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-14 00:45:23,842 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:23,843 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-14 00:45:24,429 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-14 00:45:24,429 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-14 00:45:24,434 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:24,434 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:24,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:24,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-14 00:45:24,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:24,450 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-14 00:45:24,460 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-14 00:45:24,460 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-14 00:45:24,460 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:45:24,460 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:45:24,465 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-14 00:45:24,472 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-14 00:45:24,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:24,607 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-14 00:45:24,612 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-14 00:45:24,617 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-14 00:45:24,622 [ scc.config] DEBUG Found github.token
2024-12-14 00:45:24,622 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-14 00:45:24,622 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:24,660 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:24,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:24,665 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:24,705 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:24,713 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0746825e0> has no local changes
2024-12-14 00:45:24,713 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:24,722 [ scc.git] DEBUG [detached HEAD ec8c237] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:24,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:24,723 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-14 00:45:24,723 [ scc.repo] DEBUG ## PRs found:
2024-12-14 00:45:25,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-14 00:45:25,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-14 00:45:26,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-14 00:45:26,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-14 00:45:27,030 [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-14 00:45:27,477 [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-14 00:45:27,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-14 00:45:28,349 [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-14 00:45:28,350 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-14 00:45:28,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-14 00:45:29,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-14 00:45:29,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-14 00:45:30,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-14 00:45:30,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-14 00:45:31,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-14 00:45:31,713 [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-14 00:45:32,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-14 00:45:32,543 [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-14 00:45:32,544 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-14 00:45:33,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-14 00:45:33,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-14 00:45:34,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-14 00:45:34,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-14 00:45:34,580 [ scc.repo] DEBUG ## Branches found:
2024-12-14 00:45:34,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-14 00:45:34,580 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:34,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:34,587 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-14 00:45:34,592 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-14 00:45:34,592 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-14 00:45:34,599 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-14 00:45:34,604 [ scc.git] DEBUG Already up to date.
2024-12-14 00:45:34,605 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-14 00:45:35,162 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-14 00:45:35,162 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-14 00:45:35,167 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-14 00:45:35,528 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-14 00:45:35,528 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-14 00:45:35,534 [ scc.git] DEBUG ## Unique users: []
2024-12-14 00:45:35,534 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:35,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:35,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-14 00:45:35,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:35,554 [ 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-14 00:45:35,565 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-14 00:45:35,565 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-14 00:45:35,565 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-14 00:45:35,566 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-14 00:45:35,572 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-14 00:45:35,579 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-14 00:45:35,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:35,717 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-14 00:45:35,726 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-14 00:45:35,732 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#278](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-14 00:45:35,737 [ scc.config] DEBUG Found github.token
2024-12-14 00:45:35,738 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-14 00:45:35,738 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-14 00:45:35,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:35,749 [ 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-14 00:45:35,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-14 00:45:35,766 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-14 00:45:35,766 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-14 00:45:36,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:36,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-14 00:45:36,280 [ scc.git] DEBUG Get sha1 of %s
2024-12-14 00:45:36,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-14 00:45:36,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:36,329 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:36,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa074716f40> has no local changes
2024-12-14 00:45:36,337 [ 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:36,347 [ scc.git] DEBUG [detached HEAD 0f89b7b] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:36,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:36,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-14 00:45:36,431 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-14 00:45:36,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:36,634 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-14 00:45:36,639 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-14 00:45:37,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:37,019 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-14 00:45:37,023 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-14 00:45:37,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:37,416 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-14 00:45:37,420 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-14 00:45:37,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:37,809 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-14 00:45:38,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:38,197 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-14 00:45:38,202 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-14 00:45:38,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:38,589 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-14 00:45:38,594 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-14 00:45:38,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:38,977 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-14 00:45:38,982 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-14 00:45:39,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:39,403 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-14 00:45:39,408 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-14 00:45:39,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:39,808 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-14 00:45:39,813 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-14 00:45:40,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:40,205 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-14 00:45:40,210 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-14 00:45:40,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:40,591 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-14 00:45:40,596 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-14 00:45:41,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:41,061 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-14 00:45:41,066 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-14 00:45:41,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:41,477 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-14 00:45:41,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:41,863 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-14 00:45:42,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:42,240 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-14 00:45:42,244 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-14 00:45:42,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:42,632 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-14 00:45:43,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:43,021 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-14 00:45:43,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:43,408 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-14 00:45:43,413 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-14 00:45:43,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:43,792 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-14 00:45:43,796 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-14 00:45:44,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:44,193 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-14 00:45:44,197 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-14 00:45:44,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:44,599 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-14 00:45:44,603 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-14 00:45:44,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-14 00:45:44,978 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-14 00:45:44,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-14 00:45:45,056 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07a44fee0> has local changes
2024-12-14 00:45:45,056 [ 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 422 dependabot[bot] 'Bump omero-figure from `1dfb138` to `d5050d8`'
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)
Updating d5050d8c..fb316a7e
Previously merged:
- PR 602 will-moore 'Changelog 7.2.0'
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
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
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 17 jburel 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 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#278 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/278/)'
2024-12-14 00:45:45,070 [ scc.git] DEBUG [detached HEAD b4f6558] merge master -Dorg -Ssuccess-only
2024-12-14 00:45:45,070 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-14 00:45:45,070 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-14 00:45:45,070 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,070 [ scc.merge] INFO
2024-12-14 00:45:45,070 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 422 dependabot[bot] 'Bump omero-figure from `1dfb138` to `d5050d8`'
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-14 00:45:45,071 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-14 00:45:45,071 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-14 00:45:45,071 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-14 00:45:45,071 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-14 00:45:45,071 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-14 00:45:45,071 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-14 00:45:45,071 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-14 00:45:45,071 [ scc.merge] INFO
2024-12-14 00:45:45,071 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-14 00:45:45,071 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature' (user: Tom-TBT)
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-14 00:45:45,071 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-14 00:45:45,071 [ scc.merge] INFO Updating d5050d8c..fb316a7e
2024-12-14 00:45:45,072 [ scc.merge] INFO Previously merged:
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 602 will-moore 'Changelog 7.2.0'
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-14 00:45:45,072 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-14 00:45:45,072 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-14 00:45:45,072 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-14 00:45:45,072 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-14 00:45:45,072 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2024-12-14 00:45:45,072 [ scc.merge] INFO
2024-12-14 00:45:45,072 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-14 00:45:45,072 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-14 00:45:45,073 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-14 00:45:45,073 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-14 00:45:45,073 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-14 00:45:45,073 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-14 00:45:45,073 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-12-14 00:45:45,073 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-14 00:45:45,073 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-14 00:45:45,073 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,073 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-14 00:45:45,073 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-14 00:45:45,073 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-14 00:45:45,074 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-14 00:45:45,074 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2024-12-14 00:45:45,074 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-14 00:45:45,074 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-14 00:45:45,074 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-14 00:45:45,074 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-14 00:45:45,074 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,074 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,074 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-14 00:45:45,074 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-14 00:45:45,075 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-14 00:45:45,075 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-14 00:45:45,075 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Repository: ome/scripts
2024-12-14 00:45:45,075 [ scc.merge] INFO Excluded PRs:
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-14 00:45:45,075 [ scc.merge] INFO Already up to date.
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Merged PRs:
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-14 00:45:45,075 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-14 00:45:45,075 [ scc.merge] INFO
2024-12-14 00:45:45,075 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-14 00:45:45,075 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-14 00:45:45,080 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-14 00:45:45,085 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-14 00:45:45,090 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-14 00:45:45,094 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-14 00:45:45,099 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-14 00:45:45,103 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-14 00:45:45,108 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-14 00:45:45,113 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-14 00:45:45,117 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-14 00:45:45,122 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-14 00:45:45,127 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-14 00:45:45,133 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-14 00:45:45,138 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-14 00:45:45,143 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-14 00:45:45,148 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-14 00:45:45,152 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-14 00:45:45,157 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-14 00:45:45,161 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-14 00:45:45,166 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-14 00:45:45,170 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-14 00:45:45,175 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-14 00:45:45,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-14 00:45:45,180 [ scc.git] DEBUG Calling 'git remote'
2024-12-14 00:45:45,184 [ 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 e0c1d9d] 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 d5050d8c
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 c8610db
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 d1f755d] 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-14 00:46:31,902 [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-14 00:46:40,734 [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-14 00:46:43,033 [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-14 00:46:47,498 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-14 00:47:30,481 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/28c89a1b/images/svgs/logo.svg){kind=logo}
