Console Output
Skipping 87 KB..
Full Logero/figure_scripts/Figure_To_Pdf.py | 247 +++++++++++++++++++--
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/css/figure.css | 114 +++++++++-
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/index.html | 4 +
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/js/models/panel_model.js | 169 ++++++++++++--
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/js/views/colorbar_form_view.js | 124 +++++++++++
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/js/views/lutpicker.js | 64 +++---
2025-01-19 00:43:10,695 [ scc.git] DEBUG src/js/views/panel_view.js | 75 ++++++-
2025-01-19 00:43:10,696 [ scc.git] DEBUG src/js/views/right_panel_view.js | 13 ++
2025-01-19 00:43:10,696 [ scc.git] DEBUG src/templates/colorbar.template.html | 42 ++++
2025-01-19 00:43:10,696 [ scc.git] DEBUG src/templates/colorbar_form.template.html | 115 ++++++++++
2025-01-19 00:43:10,698 [ scc.git] DEBUG 10 files changed, 899 insertions(+), 68 deletions(-)
2025-01-19 00:43:10,698 [ scc.git] DEBUG create mode 100644 src/js/views/colorbar_form_view.js
2025-01-19 00:43:10,698 [ scc.git] DEBUG create mode 100644 src/templates/colorbar.template.html
2025-01-19 00:43:10,698 [ scc.git] DEBUG create mode 100644 src/templates/colorbar_form.template.html
2025-01-19 00:43:10,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:10,822 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:43:10,862 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:10,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:10,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:43:10,906 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:43:10,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558e4c3550> has no local changes
2025-01-19 00:43:10,915 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:43:10,927 [ scc.git] DEBUG [detached HEAD cd72da43] merge master -Dorg -Ssuccess-only
2025-01-19 00:43:10,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:43:10,928 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:43:11,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-01-19 00:43:11,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-01-19 00:43:12,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-01-19 00:43:12,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-19 00:43:13,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:13,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-01-19 00:43:14,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:14,288 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-01-19 00:43:14,289 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:43:14,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-19 00:43:14,289 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:14,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:14,296 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:43:14,303 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:43:14,303 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:43:14,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:43:14,317 [ scc.git] DEBUG Already up to date.
2025-01-19 00:43:14,317 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-01-19 00:43:14,744 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-01-19 00:43:14,745 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-01-19 00:43:14,750 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:43:14,750 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:14,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:14,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-19 00:43:14,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:14,768 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-01-19 00:43:14,779 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-01-19 00:43:14,780 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:43:14,782 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-01-19 00:43:14,782 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-01-19 00:43:14,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:14,931 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:43:14,975 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:14,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:14,983 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:43:15,027 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:43:15,034 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558f5932e0> has no local changes
2025-01-19 00:43:15,035 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:43:15,044 [ scc.git] DEBUG [detached HEAD f9718b5] merge master -Dorg -Ssuccess-only
2025-01-19 00:43:15,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:43:15,045 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:43:15,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-01-19 00:43:15,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-01-19 00:43:16,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-01-19 00:43:16,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-01-19 00:43:16,903 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:17,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-19 00:43:18,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:18,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:19,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-01-19 00:43:19,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:19,503 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-19 00:43:19,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-01-19 00:43:19,945 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:20,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-19 00:43:20,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:21,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:21,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-01-19 00:43:22,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:22,276 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-19 00:43:22,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-01-19 00:43:22,716 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:23,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-19 00:43:23,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:24,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:24,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-01-19 00:43:25,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:25,091 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-19 00:43:25,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-01-19 00:43:26,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-01-19 00:43:26,013 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:26,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-19 00:43:27,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:27,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:28,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-01-19 00:43:28,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:28,863 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-19 00:43:29,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-01-19 00:43:29,304 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:29,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-19 00:43:30,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:30,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:31,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-01-19 00:43:31,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:31,817 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-19 00:43:32,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-01-19 00:43:32,282 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:32,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-19 00:43:33,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:33,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:34,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-01-19 00:43:35,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:35,035 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-19 00:43:35,035 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:43:35,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-19 00:43:35,036 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:35,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:35,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:43:35,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:43:35,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:43:35,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:43:35,058 [ scc.git] DEBUG Already up to date.
2025-01-19 00:43:35,059 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-01-19 00:43:35,374 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:35,374 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-01-19 00:43:35,379 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-01-19 00:43:35,678 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:35,678 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-01-19 00:43:35,683 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-01-19 00:43:35,960 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:35,960 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-01-19 00:43:35,965 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-01-19 00:43:36,248 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:36,248 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-01-19 00:43:36,253 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-01-19 00:43:36,534 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:36,534 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-01-19 00:43:36,539 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-01-19 00:43:36,822 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-01-19 00:43:36,822 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-01-19 00:43:36,827 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:43:36,827 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:36,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:36,833 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-19 00:43:36,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:36,896 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-01-19 00:43:36,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:43:36,971 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-01-19 00:43:36,971 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-01-19 00:43:37,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:37,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-19 00:43:37,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:37,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-01-19 00:43:37,414 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-19 00:43:37,415 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:43:37,422 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-01-19 00:43:37,422 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-01-19 00:43:37,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:37,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-19 00:43:37,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:37,586 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-19 00:43:37,666 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-19 00:43:37,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-19 00:43:37,667 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:43:37,667 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:43:37,673 [ scc.git] DEBUG Calling 'git reset --hard 7b3eb392a1cadc327e27d7bb2c55ffac7442abbf'
2025-01-19 00:43:37,682 [ scc.git] DEBUG HEAD is now at 7b3eb39 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-01-19 00:43:37,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:37,939 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-01-19 00:43:37,945 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-19 00:43:37,950 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-01-19 00:43:37,954 [ scc.config] DEBUG Found github.token
2025-01-19 00:43:37,955 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-01-19 00:43:37,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-19 00:43:37,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:38,003 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-01-19 00:43:38,198 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-19 00:43:38,198 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:43:38,203 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-01-19 00:43:38,203 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-01-19 00:43:38,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:38,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-19 00:43:38,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:38,365 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-01-19 00:43:38,431 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-19 00:43:38,431 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:43:38,436 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-01-19 00:43:38,436 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-01-19 00:43:38,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:38,724 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-19 00:43:38,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:38,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-19 00:43:38,839 [ scc.git] DEBUG Auto-merging package-lock.json
2025-01-19 00:43:38,839 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-01-19 00:43:38,839 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:43:38,840 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:43:38,845 [ scc.git] DEBUG Calling 'git reset --hard 402b97e1e706108eb3ccf76ab0aaf2181b01f5ff'
2025-01-19 00:43:38,852 [ scc.git] DEBUG HEAD is now at 402b97e merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-01-19 00:43:39,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:43:39,100 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-01-19 00:43:39,105 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-01-19 00:43:39,111 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-01-19 00:43:39,115 [ scc.config] DEBUG Found github.token
2025-01-19 00:43:39,115 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-01-19 00:43:39,116 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:43:39,153 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:39,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:39,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:43:39,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:43:39,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558e49eb80> has no local changes
2025-01-19 00:43:39,209 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:43:39,218 [ scc.git] DEBUG [detached HEAD 057ffc8] merge master -Dorg -Ssuccess-only
2025-01-19 00:43:39,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:43:39,219 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:43:39,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-01-19 00:43:40,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500 HTTP/1.1" 200 None
2025-01-19 00:43:40,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/500/comments HTTP/1.1" 200 None
2025-01-19 00:43:41,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-19 00:43:41,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:42,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:42,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82 HTTP/1.1" 200 None
2025-01-19 00:43:43,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6555cbcadb46c523dadfcf4e6d58d0f0efd02a82?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:43,110 [ scc.repo] DEBUG - PR 500 will-moore 'Support max_active_channels'
2025-01-19 00:43:43,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-01-19 00:43:43,565 [ scc.repo] DEBUG # ... Include label: dependencies
2025-01-19 00:43:44,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-19 00:43:44,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:45,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:45,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-01-19 00:43:46,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:46,327 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-19 00:43:46,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-01-19 00:43:47,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-01-19 00:43:47,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-01-19 00:43:48,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-01-19 00:43:48,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-19 00:43:49,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:49,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:50,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-01-19 00:43:50,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:50,624 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-19 00:43:51,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-01-19 00:43:51,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-01-19 00:43:52,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-19 00:43:52,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:53,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:43:53,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-01-19 00:43:54,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:54,077 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-01-19 00:43:54,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-01-19 00:43:54,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-01-19 00:43:55,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-19 00:43:55,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:43:56,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-01-19 00:43:56,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:43:56,770 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-01-19 00:43:56,770 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:43:56,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-19 00:43:56,771 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:43:56,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:43:56,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:43:56,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:43:56,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:43:56,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:43:56,797 [ scc.git] DEBUG Already up to date.
2025-01-19 00:43:56,798 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-01-19 00:43:58,384 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-19 00:43:58,384 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-01-19 00:43:58,390 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-01-19 00:44:00,409 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-19 00:44:00,410 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-01-19 00:44:00,417 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-01-19 00:44:00,731 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-19 00:44:00,731 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-01-19 00:44:00,736 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-01-19 00:44:01,031 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-19 00:44:01,031 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-01-19 00:44:01,036 [ scc.git] DEBUG Calling 'git fetch origin pull/500/head'
2025-01-19 00:44:01,693 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-01-19 00:44:01,694 [ scc.git] DEBUG * branch refs/pull/500/head -> FETCH_HEAD
2025-01-19 00:44:01,699 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:01,699 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:01,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:01,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-19 00:44:01,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:01,719 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-01-19 00:44:01,799 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-19 00:44:01,800 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:01,804 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-01-19 00:44:01,804 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-01-19 00:44:01,804 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-01-19 00:44:01,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:01,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-19 00:44:01,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:01,953 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-01-19 00:44:02,300 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-19 00:44:02,300 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-19 00:44:02,300 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-19 00:44:02,300 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-01-19 00:44:02,300 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:02,309 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-01-19 00:44:02,310 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-01-19 00:44:02,310 [ scc.git] DEBUG src/app/header.html | 5 +
2025-01-19 00:44:02,310 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-01-19 00:44:02,310 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-01-19 00:44:02,310 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-01-19 00:44:02,310 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-01-19 00:44:02,310 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-01-19 00:44:02,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:02,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-19 00:44:02,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:02,465 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-01-19 00:44:02,485 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-01-19 00:44:02,486 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:02,490 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-01-19 00:44:02,490 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-01-19 00:44:02,490 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-01-19 00:44:02,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:02,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-19 00:44:02,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:02,852 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-01-19 00:44:02,992 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:03,002 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-01-19 00:44:03,002 [ scc.git] DEBUG package.json | 2 +-
2025-01-19 00:44:03,002 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-01-19 00:44:03,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:03,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-19 00:44:03,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:03,221 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 500 (Support max_active_channels) 6555cbcadb46c523dadfcf4e6d58d0f0efd02a82'
2025-01-19 00:44:03,804 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-01-19 00:44:03,804 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-01-19 00:44:03,804 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-01-19 00:44:03,804 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-01-19 00:44:03,804 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-01-19 00:44:03,804 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:03,810 [ scc.git] DEBUG plugin/omero_iviewer/iviewer_settings.py | 9 +++++++++
2025-01-19 00:44:03,810 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 2 ++
2025-01-19 00:44:03,810 [ scc.git] DEBUG src/app/context.js | 31 +++++++++++++++++++++++++++++++
2025-01-19 00:44:03,810 [ scc.git] DEBUG src/model/image_info.js | 22 ++++++++++++++++++++++
2025-01-19 00:44:03,810 [ scc.git] DEBUG src/settings/channel-range.js | 9 +++++++++
2025-01-19 00:44:03,810 [ scc.git] DEBUG src/settings/channel-settings.js | 1 -
2025-01-19 00:44:03,812 [ scc.git] DEBUG src/utils/constants.js | 1 +
2025-01-19 00:44:03,812 [ scc.git] DEBUG 7 files changed, 74 insertions(+), 1 deletion(-)
2025-01-19 00:44:03,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:03,950 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:03,994 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:03,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:04,001 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:04,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:04,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558e4a4f40> has no local changes
2025-01-19 00:44:04,062 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:04,072 [ scc.git] DEBUG [detached HEAD 96d01f7] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:04,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:04,072 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:04,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-01-19 00:44:04,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-01-19 00:44:05,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-01-19 00:44:05,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-19 00:44:06,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:06,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-01-19 00:44:07,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:07,239 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-01-19 00:44:07,240 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:07,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-19 00:44:07,240 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:07,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:07,246 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:07,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:07,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:07,258 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:07,264 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:07,264 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-01-19 00:44:08,272 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-01-19 00:44:08,272 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-01-19 00:44:08,277 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:08,277 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:08,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:08,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-19 00:44:08,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:08,296 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-01-19 00:44:08,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:08,311 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-01-19 00:44:08,311 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-01-19 00:44:08,311 [ scc.git] DEBUG requirements.txt | 2 +-
2025-01-19 00:44:08,311 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-01-19 00:44:08,311 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-01-19 00:44:08,311 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-01-19 00:44:08,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:08,449 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:08,495 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:08,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:08,501 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:08,549 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:08,557 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c437520> has no local changes
2025-01-19 00:44:08,557 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:08,567 [ scc.git] DEBUG [detached HEAD 36dffa8] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:08,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:08,568 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:08,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-01-19 00:44:09,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-01-19 00:44:09,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-01-19 00:44:10,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-19 00:44:11,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:11,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-01-19 00:44:12,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:12,224 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-19 00:44:12,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-01-19 00:44:13,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-01-19 00:44:13,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-19 00:44:14,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:14,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-01-19 00:44:15,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:15,029 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-19 00:44:15,029 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:15,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-19 00:44:15,030 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:15,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:15,036 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:15,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:15,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:15,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:15,052 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:15,052 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-01-19 00:44:15,944 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-19 00:44:15,944 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-01-19 00:44:15,950 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-01-19 00:44:16,686 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-01-19 00:44:16,686 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-01-19 00:44:16,692 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:16,692 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:16,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:16,699 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-19 00:44:16,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:16,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-19 00:44:16,879 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-01-19 00:44:16,879 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-01-19 00:44:16,879 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-19 00:44:16,879 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-19 00:44:16,879 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:44:16,879 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:44:16,885 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-19 00:44:16,893 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-19 00:44:17,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:17,034 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-01-19 00:44:17,042 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-19 00:44:17,109 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-01-19 00:44:17,116 [ scc.config] DEBUG Found github.token
2025-01-19 00:44:17,117 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-01-19 00:44:17,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-19 00:44:17,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:17,138 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-19 00:44:17,233 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-01-19 00:44:17,233 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-01-19 00:44:17,233 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-01-19 00:44:17,233 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:44:17,234 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:44:17,240 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-19 00:44:17,248 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-01-19 00:44:17,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:17,435 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-01-19 00:44:17,443 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-01-19 00:44:17,452 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-01-19 00:44:17,460 [ scc.config] DEBUG Found github.token
2025-01-19 00:44:17,460 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-01-19 00:44:17,460 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:17,499 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:17,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:17,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:17,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:17,560 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c44bb20> has no local changes
2025-01-19 00:44:17,560 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:17,572 [ scc.git] DEBUG [detached HEAD 519499c] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:17,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:17,573 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:17,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-01-19 00:44:18,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-01-19 00:44:18,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-01-19 00:44:19,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-01-19 00:44:19,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-01-19 00:44:20,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-01-19 00:44:20,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-01-19 00:44:21,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-01-19 00:44:21,113 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:21,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-19 00:44:21,113 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:21,124 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:21,124 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:21,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:21,135 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:21,135 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:21,135 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,140 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:21,181 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:21,225 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:21,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3ee880> has no local changes
2025-01-19 00:44:21,232 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:21,241 [ scc.git] DEBUG [detached HEAD fd80f01] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:21,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:21,242 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:21,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-01-19 00:44:21,531 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:21,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-19 00:44:21,531 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:21,546 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:21,546 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:21,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:21,558 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:21,559 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:21,559 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,564 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:21,607 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:21,651 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:21,657 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3ee6a0> has no local changes
2025-01-19 00:44:21,658 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:21,666 [ scc.git] DEBUG [detached HEAD 3a64b18] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:21,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:21,667 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:21,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 2
2025-01-19 00:44:21,965 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:21,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-19 00:44:21,965 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,971 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:21,976 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:21,976 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:21,981 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:21,986 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:21,986 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:21,987 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:21,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:21,992 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:22,031 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:22,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:22,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:22,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:22,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3a85e0> has no local changes
2025-01-19 00:44:22,082 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Already up to date.
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:22,090 [ scc.git] DEBUG [detached HEAD a708dca] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:22,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:22,091 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:22,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-01-19 00:44:22,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-01-19 00:44:23,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-01-19 00:44:23,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-19 00:44:24,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:24,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-01-19 00:44:25,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:25,230 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-19 00:44:25,230 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:25,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-19 00:44:25,230 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:25,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:25,236 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:25,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:25,241 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:25,247 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:25,253 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:25,253 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-01-19 00:44:25,629 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-01-19 00:44:25,629 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-01-19 00:44:25,634 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:25,634 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:25,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:25,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-19 00:44:25,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:25,649 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-19 00:44:25,839 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-01-19 00:44:25,839 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-01-19 00:44:25,839 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG Auto-merging setup.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-01-19 00:44:25,840 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:44:25,840 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:44:25,846 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-19 00:44:25,853 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-01-19 00:44:25,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:25,993 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-01-19 00:44:26,002 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-01-19 00:44:26,100 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-01-19 00:44:26,106 [ scc.config] DEBUG Found github.token
2025-01-19 00:44:26,106 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-01-19 00:44:26,106 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:26,148 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:26,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:26,154 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:26,191 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:26,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3a87f0> has no local changes
2025-01-19 00:44:26,197 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:26,205 [ scc.git] DEBUG [detached HEAD 72df7b2] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:26,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:26,206 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:26,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-01-19 00:44:26,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-01-19 00:44:27,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-01-19 00:44:28,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-01-19 00:44:28,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:29,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:44:29,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-01-19 00:44:30,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-01-19 00:44:30,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-01-19 00:44:31,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-01-19 00:44:31,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-19 00:44:32,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:32,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-01-19 00:44:32,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:32,990 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-19 00:44:32,990 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:32,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-19 00:44:32,990 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:32,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:32,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:33,000 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:33,000 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:33,006 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:33,012 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:33,012 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-01-19 00:44:33,356 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-01-19 00:44:33,357 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-01-19 00:44:33,361 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:33,361 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:33,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:33,367 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-01-19 00:44:33,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:33,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-01-19 00:44:33,409 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-01-19 00:44:33,412 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-01-19 00:44:33,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-01-19 00:44:33,415 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-01-19 00:44:33,415 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-01-19 00:44:33,415 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-01-19 00:44:33,416 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-01-19 00:44:33,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:33,546 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:33,586 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:33,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:33,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:33,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:33,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3a8640> has no local changes
2025-01-19 00:44:33,638 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:33,651 [ scc.git] DEBUG [detached HEAD 1a08142] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:33,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:33,653 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:33,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-01-19 00:44:33,944 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:33,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-19 00:44:33,944 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:33,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:33,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:33,958 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:33,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:33,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:33,975 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:33,975 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:33,976 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:33,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:33,983 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:34,025 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:34,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:34,032 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:34,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:34,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3e2550> has no local changes
2025-01-19 00:44:34,083 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:34,092 [ scc.git] DEBUG [detached HEAD 5ff8d9e] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:34,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:34,093 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:34,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-01-19 00:44:34,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-01-19 00:44:35,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-01-19 00:44:36,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-19 00:44:36,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:37,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:44:37,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-01-19 00:44:37,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:37,958 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-01-19 00:44:37,958 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:37,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-19 00:44:37,958 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:37,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:37,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:37,971 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:37,971 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:37,978 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:37,985 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:37,986 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-01-19 00:44:38,560 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-01-19 00:44:38,560 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-01-19 00:44:38,566 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:38,566 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:38,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:38,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-01-19 00:44:38,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:38,587 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-01-19 00:44:38,661 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:44:38,664 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-01-19 00:44:38,664 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-01-19 00:44:38,664 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-01-19 00:44:38,665 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-01-19 00:44:38,665 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-01-19 00:44:38,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:38,795 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:38,843 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:38,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:38,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:38,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:38,907 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3e2790> has no local changes
2025-01-19 00:44:38,907 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:38,919 [ scc.git] DEBUG [detached HEAD 54954f6] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:38,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:38,920 [ scc.git] INFO Overriding base-branch from master to main
2025-01-19 00:44:38,920 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:39,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-01-19 00:44:39,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-01-19 00:44:40,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-01-19 00:44:40,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-01-19 00:44:41,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:41,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:44:42,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-01-19 00:44:42,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-01-19 00:44:43,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-01-19 00:44:43,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-19 00:44:44,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:44,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-01-19 00:44:45,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:45,096 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-19 00:44:45,097 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:45,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-19 00:44:45,097 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:45,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:45,103 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-01-19 00:44:45,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:45,111 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-01-19 00:44:45,117 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-01-19 00:44:45,122 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:45,122 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-01-19 00:44:45,678 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-01-19 00:44:45,679 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-01-19 00:44:45,685 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:45,685 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:45,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:45,693 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-19 00:44:45,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:45,711 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-19 00:44:45,860 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-01-19 00:44:45,860 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-01-19 00:44:45,860 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:44:45,861 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:44:45,868 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-19 00:44:45,875 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-01-19 00:44:46,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:46,028 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-01-19 00:44:46,035 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-01-19 00:44:46,042 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-01-19 00:44:46,048 [ scc.config] DEBUG Found github.token
2025-01-19 00:44:46,048 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-01-19 00:44:46,049 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:46,090 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,097 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:46,138 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:46,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c380580> has no local changes
2025-01-19 00:44:46,145 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:46,153 [ scc.git] DEBUG [detached HEAD 17ea3d6] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:46,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:46,154 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:46,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-01-19 00:44:46,426 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:46,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-19 00:44:46,426 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:46,438 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:46,439 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:46,446 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:46,453 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:46,453 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:46,453 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,460 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:46,506 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:46,552 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:46,558 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c3804f0> has no local changes
2025-01-19 00:44:46,559 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:46,567 [ scc.git] DEBUG [detached HEAD 3be0c8b] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:46,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:46,568 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:46,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-01-19 00:44:46,879 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:46,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-19 00:44:46,880 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,886 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:46,891 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:46,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:46,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:46,905 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:46,905 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:46,905 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,911 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:46,954 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:46,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:46,960 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:47,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:47,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c391bb0> has no local changes
2025-01-19 00:44:47,011 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:47,020 [ scc.git] DEBUG [detached HEAD 8082ce8] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:47,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:47,020 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:47,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-01-19 00:44:47,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-01-19 00:44:48,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-01-19 00:44:48,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-19 00:44:49,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:50,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-01-19 00:44:50,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:50,483 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-01-19 00:44:50,483 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:50,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-19 00:44:50,483 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:50,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:50,489 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-19 00:44:50,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:50,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-19 00:44:50,510 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-19 00:44:50,516 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:50,516 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-01-19 00:44:50,956 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-01-19 00:44:50,956 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-01-19 00:44:50,961 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:44:50,961 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:50,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:50,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-19 00:44:50,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:50,977 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-19 00:44:51,083 [ scc.git] DEBUG Auto-merging Dockerfile
2025-01-19 00:44:51,083 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-01-19 00:44:51,084 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:44:51,084 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:44:51,090 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-19 00:44:51,098 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-01-19 00:44:51,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:44:51,227 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-01-19 00:44:51,233 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-01-19 00:44:51,239 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-01-19 00:44:51,243 [ scc.config] DEBUG Found github.token
2025-01-19 00:44:51,243 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-01-19 00:44:51,244 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:44:51,281 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:51,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:51,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:44:51,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:44:51,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c338a30> has no local changes
2025-01-19 00:44:51,334 [ 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#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:44:51,342 [ scc.git] DEBUG [detached HEAD 895810c] merge master -Dorg -Ssuccess-only
2025-01-19 00:44:51,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:44:51,343 [ scc.git] INFO Overriding base-branch from master to develop
2025-01-19 00:44:51,343 [ scc.repo] DEBUG ## PRs found:
2025-01-19 00:44:51,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-01-19 00:44:52,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-01-19 00:44:52,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-01-19 00:44:53,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-19 00:44:53,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:53,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-19 00:44:54,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-01-19 00:44:54,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:54,831 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-19 00:44:55,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-01-19 00:44:55,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-01-19 00:44:56,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-19 00:44:56,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-19 00:44:56,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-01-19 00:44:57,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-01-19 00:44:57,375 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-19 00:44:57,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-01-19 00:44:58,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-01-19 00:44:58,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-01-19 00:44:59,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-01-19 00:44:59,247 [ scc.repo] DEBUG ## Branches found:
2025-01-19 00:44:59,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-19 00:44:59,247 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:44:59,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:44:59,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-01-19 00:44:59,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-19 00:44:59,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-01-19 00:44:59,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-01-19 00:44:59,271 [ scc.git] DEBUG Already up to date.
2025-01-19 00:44:59,272 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-01-19 00:45:00,077 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-19 00:45:00,078 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-01-19 00:45:00,083 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-01-19 00:45:00,403 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-01-19 00:45:00,404 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-01-19 00:45:00,409 [ scc.git] DEBUG ## Unique users: []
2025-01-19 00:45:00,409 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:45:00,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:45:00,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-19 00:45:00,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:45:00,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-19 00:45:00,522 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-01-19 00:45:00,522 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-19 00:45:00,522 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-19 00:45:00,528 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-19 00:45:00,536 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-01-19 00:45:00,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:00,682 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-01-19 00:45:00,697 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-01-19 00:45:00,704 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#310](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-01-19 00:45:00,710 [ scc.config] DEBUG Found github.token
2025-01-19 00:45:00,710 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-01-19 00:45:00,710 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-19 00:45:00,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:45:00,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-01-19 00:45:00,782 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-19 00:45:00,786 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-01-19 00:45:00,786 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-01-19 00:45:01,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:01,060 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-19 00:45:01,103 [ scc.git] DEBUG Get sha1 of %s
2025-01-19 00:45:01,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-19 00:45:01,109 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:45:01,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:45:01,162 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558c338670> has no local changes
2025-01-19 00:45:01,163 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:45:01,173 [ scc.git] DEBUG [detached HEAD 5383134] merge master -Dorg -Ssuccess-only
2025-01-19 00:45:01,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:01,174 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-19 00:45:01,257 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-01-19 00:45:01,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:01,460 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-01-19 00:45:01,464 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-01-19 00:45:01,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:01,873 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-01-19 00:45:01,878 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-01-19 00:45:02,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:02,283 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-01-19 00:45:02,288 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-01-19 00:45:02,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:02,673 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-01-19 00:45:03,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:03,064 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-01-19 00:45:03,068 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-01-19 00:45:03,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:03,463 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-01-19 00:45:03,469 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-01-19 00:45:03,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:03,856 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-01-19 00:45:03,861 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-01-19 00:45:04,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:04,248 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-01-19 00:45:04,255 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-01-19 00:45:04,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:04,635 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-01-19 00:45:04,640 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-01-19 00:45:04,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:05,010 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-01-19 00:45:05,016 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-01-19 00:45:05,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:05,396 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-01-19 00:45:05,401 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-01-19 00:45:05,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:05,788 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-01-19 00:45:05,795 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-01-19 00:45:06,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:06,184 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-01-19 00:45:06,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:06,583 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-01-19 00:45:06,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:06,972 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-01-19 00:45:06,977 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-01-19 00:45:07,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:07,367 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-01-19 00:45:07,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:07,763 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-01-19 00:45:08,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:08,145 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-01-19 00:45:08,150 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-01-19 00:45:08,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:08,524 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-01-19 00:45:08,530 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-01-19 00:45:08,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:08,904 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-01-19 00:45:08,910 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-01-19 00:45:09,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:09,293 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-01-19 00:45:09,299 [ scc.config] DEBUG Found submodule.scripts.url
2025-01-19 00:45:09,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-19 00:45:09,698 [ scc.config] DEBUG Found submodule.scripts.branch
2025-01-19 00:45:09,699 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-19 00:45:09,788 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f558f586370> has local changes
2025-01-19 00:45:09,788 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 500 will-moore 'Support max_active_channels'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#310 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/310/)'
2025-01-19 00:45:09,804 [ scc.git] DEBUG [detached HEAD a51bd6c] merge master -Dorg -Ssuccess-only
2025-01-19 00:45:09,804 [ scc.merge] INFO Repository: ome/omero-plugins
2025-01-19 00:45:09,804 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-01-19 00:45:09,805 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 430 dependabot[bot] 'Bump omero-figure from `fb316a7` to `a80640a`'
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-01-19 00:45:09,805 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-01-19 00:45:09,805 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-01-19 00:45:09,805 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-01-19 00:45:09,805 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-01-19 00:45:09,805 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-01-19 00:45:09,805 [ scc.merge] INFO
2025-01-19 00:45:09,805 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-01-19 00:45:09,805 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-01-19 00:45:09,805 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-01-19 00:45:09,805 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Repository: ome/omero-figure
2025-01-19 00:45:09,806 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-01-19 00:45:09,806 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-01-19 00:45:09,806 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Repository: ome/omero-gallery
2025-01-19 00:45:09,806 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-01-19 00:45:09,806 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-01-19 00:45:09,806 [ scc.merge] INFO
2025-01-19 00:45:09,806 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-01-19 00:45:09,807 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 500 will-moore 'Support max_active_channels'
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Repository: ome/omero-mapr
2025-01-19 00:45:09,807 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Repository: ome/omero-metadata
2025-01-19 00:45:09,807 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,807 [ scc.merge] INFO Repository: ome/omero-parade
2025-01-19 00:45:09,807 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-01-19 00:45:09,807 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,807 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-rois
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-signup
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-01-19 00:45:09,808 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-upload
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-01-19 00:45:09,808 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-01-19 00:45:09,808 [ scc.merge] INFO
2025-01-19 00:45:09,808 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-01-19 00:45:09,808 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,808 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-01-19 00:45:09,809 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-01-19 00:45:09,809 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-01-19 00:45:09,809 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-01-19 00:45:09,809 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Repository: ome/scripts
2025-01-19 00:45:09,809 [ scc.merge] INFO Excluded PRs:
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-01-19 00:45:09,809 [ scc.merge] INFO Already up to date.
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Merged PRs:
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-19 00:45:09,809 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-01-19 00:45:09,809 [ scc.merge] INFO
2025-01-19 00:45:09,809 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-19 00:45:09,810 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-01-19 00:45:09,818 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-01-19 00:45:09,824 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-01-19 00:45:09,830 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-01-19 00:45:09,836 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-01-19 00:45:09,842 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-01-19 00:45:09,849 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-01-19 00:45:09,855 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-01-19 00:45:09,862 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-01-19 00:45:09,868 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-01-19 00:45:09,873 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-01-19 00:45:09,880 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-01-19 00:45:09,886 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-01-19 00:45:09,892 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-01-19 00:45:09,899 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-01-19 00:45:09,906 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-01-19 00:45:09,911 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-01-19 00:45:09,917 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-01-19 00:45:09,923 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-01-19 00:45:09,928 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-01-19 00:45:09,934 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-01-19 00:45:09,941 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-01-19 00:45:09,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-01-19 00:45:09,947 [ scc.git] DEBUG Calling 'git remote'
2025-01-19 00:45:09,953 [ 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 5156318] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from a80640a9
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 4883ef7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-01-19 00:45:56,619 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-01-19 00:46:05,356 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-01-19 00:46:07,647 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-19 00:46:12,044 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-01-19 00:46:50,884 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
