![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
Started by user devspace [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/WEBSITE-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision 654fab96d71411fab33e55b79057bcbf94eef8a2 The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/WEBSITE-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision 654fab96d71411fab33e55b79057bcbf94eef8a2 (master) > git config core.sparsecheckout # timeout=10 > git checkout -f 654fab96d71411fab33e55b79057bcbf94eef8a2 # timeout=10 Commit message: "Merge pull request #18 from jburel/python_311" > git rev-list --no-walk 654fab96d71411fab33e55b79057bcbf94eef8a2 # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision f3f69839a5b5cca7c070e7d3542fc6ef66528462 (refs/remotes/origin/master) Commit message: "Merge pull request #826 from lubianat/master" > git rev-parse --resolve-git-dir /home/omero/workspace/WEBSITE-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/www.openmicroscopy.org # timeout=10 Fetching upstream changes from https://github.com/ome/www.openmicroscopy.org > git --version # timeout=10 > git --version # 'git version 2.43.5' > git fetch --tags --force --progress -- https://github.com/ome/www.openmicroscopy.org +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f f3f69839a5b5cca7c070e7d3542fc6ef66528462 # timeout=10 > git rev-list --no-walk 0d27a24bb13e0b956cefb6a69e8167633d46e6f7 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 [Pipeline] pwd [Pipeline] sh + mkdir -p build + echo build [Pipeline] sh + pushd build ~/workspace/WEBSITE-push/build ~/workspace/WEBSITE-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule._minutes.url # timeout=10 > git config -f .gitmodules --get submodule._minutes.path # timeout=10 > git config --get submodule.Schemas.url # timeout=10 > git config -f .gitmodules --get submodule.Schemas.path # timeout=10 > git submodule update --init --recursive _minutes # timeout=10 > git submodule update --init --recursive Schemas # timeout=10 + popd ~/workspace/WEBSITE-push + python3.11 -m venv build/venv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ unset VIRTUAL_ENV_PROMPT ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/WEBSITE-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/WEBSITE-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ VIRTUAL_ENV_PROMPT='(venv) ' ++ export VIRTUAL_ENV_PROMPT ++ hash -r + python3.11 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib64/python3.11/site-packages (22.3.1) Collecting pip Using cached pip-25.2-py3-none-any.whl (1.8 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 22.3.1 Uninstalling pip-22.3.1: Successfully uninstalled pip-22.3.1 Successfully installed pip-25.2 + python3.11 -m pip install scc Collecting scc Using cached scc-0.20.0-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached pygithub-2.8.1-py3-none-any.whl.metadata (3.9 kB) Collecting PyYAML>=5.1 (from scc) Using cached pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl.metadata (2.4 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.15-py3-none-any.whl.metadata (25 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.17.0-py2.py3-none-any.whl.metadata (1.7 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.20-py2.py3-none-any.whl.metadata (50 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached pynacl-1.6.0-cp38-abi3-manylinux_2_34_x86_64.whl.metadata (9.4 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.32.5-py3-none-any.whl.metadata (4.9 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.10.1-py3-none-any.whl.metadata (4.0 kB) Collecting typing-extensions>=4.5.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.15.0-py3-none-any.whl.metadata (3.3 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-46.0.2-cp311-abi3-manylinux_2_34_x86_64.whl.metadata (5.7 kB) Collecting cffi>=2.0.0 (from cryptography>=3.4.0->pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl.metadata (2.6 kB) Collecting pycparser (from cffi>=2.0.0->cryptography>=3.4.0->pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached pycparser-2.23-py3-none-any.whl.metadata (993 bytes) Collecting charset_normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached charset_normalizer-3.4.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl.metadata (36 kB) Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached idna-3.10-py3-none-any.whl.metadata (10 kB) Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached certifi-2025.10.5-py3-none-any.whl.metadata (2.5 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.14-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.0 kB) Using cached scc-0.20.0-py3-none-any.whl (48 kB) Using cached urllib3-1.26.20-py2.py3-none-any.whl (144 kB) Using cached pygithub-2.8.1-py3-none-any.whl (432 kB) Using cached PyJWT-2.10.1-py3-none-any.whl (22 kB) Using cached cryptography-46.0.2-cp311-abi3-manylinux_2_34_x86_64.whl (4.5 MB) Using cached cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl (215 kB) Using cached pynacl-1.6.0-cp38-abi3-manylinux_2_34_x86_64.whl (1.4 MB) Using cached pyyaml-6.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl (806 kB) Using cached requests-2.32.5-py3-none-any.whl (64 kB) Using cached charset_normalizer-3.4.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl (150 kB) Using cached idna-3.10-py3-none-any.whl (70 kB) Using cached certifi-2025.10.5-py3-none-any.whl (163 kB) Using cached typing_extensions-4.15.0-py3-none-any.whl (44 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached pycparser-2.23-py3-none-any.whl (118 kB) Using cached ruamel.yaml-0.18.15-py3-none-any.whl (119 kB) Using cached ruamel.yaml.clib-0.2.14-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.17.0-py2.py3-none-any.whl (11 kB) Installing collected packages: urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset_normalizer, certifi, yaclifw, ruamel.yaml, requests, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc Successfully installed PyGithub-2.8.1 PyYAML-6.0.3 certifi-2025.10.5 cffi-2.0.0 charset_normalizer-3.4.3 cryptography-46.0.2 future-1.0.0 idna-3.10 pycparser-2.23 pyjwt-2.10.1 pynacl-1.6.0 requests-2.32.5 ruamel.yaml-0.18.15 ruamel.yaml.clib-0.2.14 ruamel.yaml.jinja2-0.2.7 scc-0.20.0 six-1.17.0 typing-extensions-4.15.0 urllib3-1.26.20 yaclifw-0.2.0 [Pipeline] sh + export BASE_REPO=www.openmicroscopy.org + BASE_REPO=www.openmicroscopy.org + export BASE_BRANCH=master + BASE_BRANCH=master + export VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv + VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ unset VIRTUAL_ENV_PROMPT ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/WEBSITE-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/WEBSITE-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ VIRTUAL_ENV_PROMPT='(venv) ' ++ export VIRTUAL_ENV_PROMPT ++ hash -r + '[' merge_ci '!=' null ']' + export PUSH_BRANCH=merge_ci + PUSH_BRANCH=merge_ci + '[' null '!=' null ']' + export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment' + STATUS=success-only + MERGE_OPTIONS='-vvv --no-ask --reset --comment' + bash build/build-infra-master/recursive-merge Merge base repository (no submodule updates) 2025-10-09 07:35:47,989 [ scc.config] DEBUG Found github.token 2025-10-09 07:35:47,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2025-10-09 07:35:48,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:48,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:49,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2025-10-09 07:35:49,028 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 08:10 2025-10-09 07:35:49,029 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2025-10-09 07:35:49,031 [ scc.git] DEBUG Check current status 2025-10-09 07:35:49,031 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:35:49,033 [ scc.git] DEBUG f3f69839 Merge pull request #826 from lubianat/master 2025-10-09 07:35:49,033 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:35:49,079 [ scc.git] DEBUG 24a3011ef2664b6a8019f12e28be8e8ba7df4014 Schemas (remotes/origin/dependabot/maven/org.openmicroscopy-specification-6.5.0-1-g24a3011) 2025-10-09 07:35:49,087 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD) 2025-10-09 07:35:49,090 [ scc.config] DEBUG Found remote.origin.url 2025-10-09 07:35:49,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None 2025-10-09 07:35:50,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2025-10-09 07:35:50,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2025-10-09 07:35:50,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2025-10-09 07:35:51,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2025-10-09 07:35:51,370 [ scc.git] DEBUG Resetting... 2025-10-09 07:35:51,370 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2025-10-09 07:35:51,377 [ scc.git] DEBUG HEAD is now at f3f69839 Merge pull request #826 from lubianat/master 2025-10-09 07:35:51,378 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2025-10-09 07:35:51,420 [ scc.git] DEBUG Check current status 2025-10-09 07:35:51,420 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:35:51,423 [ scc.git] DEBUG f3f69839 Merge pull request #826 from lubianat/master 2025-10-09 07:35:51,423 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:35:51,469 [ scc.git] DEBUG 24a3011ef2664b6a8019f12e28be8e8ba7df4014 Schemas (remotes/origin/dependabot/maven/org.openmicroscopy-specification-6.5.0-1-g24a3011) 2025-10-09 07:35:51,478 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD) 2025-10-09 07:35:51,479 [ scc.merge] INFO Merging Pull Request(s) based on master 2025-10-09 07:35:51,479 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2025-10-09 07:35:51,479 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2025-10-09 07:35:51,479 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2025-10-09 07:35:51,479 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2025-10-09 07:35:51,479 [ scc.repo] DEBUG ## PRs found: 2025-10-09 07:35:51,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None 2025-10-09 07:35:52,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831 HTTP/1.1" 200 None 2025-10-09 07:35:52,453 [ scc.repo] DEBUG - PR 831 joshmoore 'Initial OME2026 page' 2025-10-09 07:35:53,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830 HTTP/1.1" 200 None 2025-10-09 07:35:53,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830/comments HTTP/1.1" 200 None 2025-10-09 07:35:53,568 [ scc.repo] DEBUG - PR 830 joshmoore 'Update Josh headshot 🌳' 2025-10-09 07:35:54,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/829 HTTP/1.1" 200 None 2025-10-09 07:35:54,057 [ scc.repo] DEBUG # ... Include label: dependencies 2025-10-09 07:35:54,057 [ scc.repo] DEBUG - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' 2025-10-09 07:35:54,057 [ scc.repo] DEBUG ## Branches found: 2025-10-09 07:35:54,058 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:35:54,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:54,060 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2025-10-09 07:35:54,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2025-10-09 07:35:54,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2025-10-09 07:35:54,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2025-10-09 07:35:54,067 [ scc.git] DEBUG Already up to date. 2025-10-09 07:35:54,067 [ scc.git] DEBUG Calling 'git fetch origin pull/829/head' 2025-10-09 07:35:54,382 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:35:54,382 [ scc.git] DEBUG * branch refs/pull/829/head -> FETCH_HEAD 2025-10-09 07:35:54,399 [ scc.git] DEBUG Calling 'git fetch origin pull/830/head' 2025-10-09 07:35:54,963 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:35:54,964 [ scc.git] DEBUG * branch refs/pull/830/head -> FETCH_HEAD 2025-10-09 07:35:54,970 [ scc.git] DEBUG Calling 'git fetch origin pull/831/head' 2025-10-09 07:35:55,450 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:35:55,450 [ scc.git] DEBUG * branch refs/pull/831/head -> FETCH_HEAD 2025-10-09 07:35:55,454 [ scc.git] DEBUG ## Unique users: [] 2025-10-09 07:35:55,454 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:35:55,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:55,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5818270b4144a153c776154ad71b8f95ac8cd2be' 2025-10-09 07:35:55,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:55,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 829 (Bump Schemas from `24a3011` to `c4e38d1`) 5818270b4144a153c776154ad71b8f95ac8cd2be' 2025-10-09 07:35:55,471 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2025-10-09 07:35:55,474 [ scc.git] DEBUG Schemas | 2 +- 2025-10-09 07:35:55,474 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2025-10-09 07:35:55,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:55,641 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:35:55,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:55,646 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 830 (Update Josh headshot 🌳) 39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:35:55,658 [ scc.git] DEBUG Failed to merge submodule Schemas (commits don't follow merge-base) 2025-10-09 07:35:55,658 [ scc.git] DEBUG CONFLICT (submodule): Merge conflict in Schemas 2025-10-09 07:35:55,658 [ scc.git] DEBUG Recursive merging with submodules currently only supports trivial cases. 2025-10-09 07:35:55,658 [ scc.git] DEBUG Please manually handle the merging of each conflicted submodule. 2025-10-09 07:35:55,658 [ scc.git] DEBUG This can be accomplished with the following steps: 2025-10-09 07:35:55,658 [ scc.git] DEBUG - go to submodule (Schemas), and either merge commit 9dc8459 2025-10-09 07:35:55,658 [ scc.git] DEBUG or update to an existing commit which has merged those changes 2025-10-09 07:35:55,658 [ scc.git] DEBUG - come back to superproject and run: 2025-10-09 07:35:55,658 [ scc.git] DEBUG 2025-10-09 07:35:55,658 [ scc.git] DEBUG git add Schemas 2025-10-09 07:35:55,658 [ scc.git] DEBUG 2025-10-09 07:35:55,658 [ scc.git] DEBUG to record the above merge or update 2025-10-09 07:35:55,658 [ scc.git] DEBUG - resolve any other conflicts in the superproject 2025-10-09 07:35:55,658 [ scc.git] DEBUG - commit the resulting index in the superproject 2025-10-09 07:35:55,659 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2025-10-09 07:35:55,659 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2025-10-09 07:35:55,667 [ scc.git] DEBUG Calling 'git reset --hard 92388117be55de33cec32e128636a24400aaf0d7' 2025-10-09 07:35:55,674 [ scc.git] DEBUG HEAD is now at 92388117 merge master -Dorg -Snone: PR 829 (Bump Schemas from `24a3011` to `c4e38d1`) 2025-10-09 07:35:56,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:56,069 [ scc.git] DEBUG Calling 'git merge-base f3f69839a5b5cca7c070e7d3542fc6ef66528462 39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:35:56,072 [ scc.git] DEBUG Calling 'git diff --name-only f3f69839a5b5cca7c070e7d3542fc6ef66528462..f3f69839a5b5cca7c070e7d3542fc6ef66528462' 2025-10-09 07:35:56,074 [ scc.git] INFO - PR 830 joshmoore 'Update Josh headshot 🌳' Conflicting PR. Removed from build [WEBSITE-push#625](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/consoleText) for more details. Possible conflicts: - PR #829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' - Schemas --conflicts 2025-10-09 07:35:56,076 [ scc.config] DEBUG Found github.token 2025-10-09 07:35:56,076 [ scc.git] DEBUG Adding comment to issue #830. 2025-10-09 07:35:57,030 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/www.openmicroscopy.org/issues/830/comments HTTP/1.1" 201 2044 2025-10-09 07:35:57,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f92cf8d4e958b22b26ccca61f92b87ae534293f4' 2025-10-09 07:35:57,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:57,036 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 831 (Initial OME2026 page) f92cf8d4e958b22b26ccca61f92b87ae534293f4' 2025-10-09 07:35:57,048 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2025-10-09 07:35:57,051 [ scc.git] DEBUG events/ome-community-meeting-2026.html | 38 ++++++++++++++++++++++++++++++++++ 2025-10-09 07:35:57,051 [ scc.git] DEBUG 1 file changed, 38 insertions(+) 2025-10-09 07:35:57,051 [ scc.git] DEBUG create mode 100644 events/ome-community-meeting-2026.html 2025-10-09 07:35:57,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:57,424 [ scc.git] DEBUG Calling 'git submodule update' 2025-10-09 07:35:57,475 [ scc.git] DEBUG Submodule path 'Schemas': checked out 'c4e38d11898c252abbdc714fbc7e76165979658e' 2025-10-09 07:35:57,476 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:35:57,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:35:57,478 [ scc.git] DEBUG Calling 'git status --porcelain' 2025-10-09 07:35:57,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8a9a2a7fd0> has no local changes 2025-10-09 07:35:57,493 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/www.openmicroscopy.org Already up to date. Merged PRs: - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' - PR 831 joshmoore 'Initial OME2026 page' Conflicting PRs (not included): - PR 830 joshmoore 'Update Josh headshot 🌳' Generated by WEBSITE-push#625 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/)' 2025-10-09 07:35:57,508 [ scc.git] DEBUG [detached HEAD 93acbdea] merge master -Dorg -Snone 2025-10-09 07:35:57,508 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org 2025-10-09 07:35:57,508 [ scc.merge] INFO Already up to date. 2025-10-09 07:35:57,508 [ scc.merge] INFO 2025-10-09 07:35:57,509 [ scc.merge] INFO Merged PRs: 2025-10-09 07:35:57,509 [ scc.merge] INFO - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' 2025-10-09 07:35:57,509 [ scc.merge] INFO - PR 831 joshmoore 'Initial OME2026 page' 2025-10-09 07:35:57,509 [ scc.merge] INFO 2025-10-09 07:35:57,509 [ scc.merge] INFO Conflicting PRs (not included): 2025-10-09 07:35:57,509 [ scc.merge] INFO - PR 830 joshmoore 'Update Josh headshot 🌳' 2025-10-09 07:35:57,509 [ scc.merge] INFO 2025-10-09 07:35:57,509 [ scc.merge] DEBUG Cleaning remote branches created for merging 2025-10-09 07:35:57,509 [ scc.git] DEBUG Calling 'git remote' Synchronizing submodule url for 'Schemas' Synchronizing submodule url for '_minutes' Merge all submodules2025-10-09 07:35:58,516 [ scc.config] DEBUG Found github.token 2025-10-09 07:35:58,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2025-10-09 07:35:58,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:59,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:35:59,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2025-10-09 07:35:59,481 [ scc.gh] DEBUG 4982 remaining from 5000 (Reset at 08:10 2025-10-09 07:35:59,482 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2025-10-09 07:35:59,485 [ scc.git] DEBUG Check current status 2025-10-09 07:35:59,485 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:35:59,487 [ scc.git] DEBUG 93acbdea merge master -Dorg -Snone 2025-10-09 07:35:59,487 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:35:59,530 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD) 2025-10-09 07:35:59,538 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD) 2025-10-09 07:35:59,541 [ scc.config] DEBUG Found remote.origin.url 2025-10-09 07:36:00,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None 2025-10-09 07:36:00,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2025-10-09 07:36:01,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2025-10-09 07:36:01,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2025-10-09 07:36:01,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2025-10-09 07:36:01,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:01,959 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas 2025-10-09 07:36:01,960 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2025-10-09 07:36:01,962 [ scc.git] DEBUG Check current status 2025-10-09 07:36:01,962 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:36:01,964 [ scc.git] DEBUG c4e38d1 Merge pull request #19 from ome/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.6.1 2025-10-09 07:36:01,964 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:36:02,001 [ scc.config] DEBUG Found remote.origin.url 2025-10-09 07:36:02,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None 2025-10-09 07:36:02,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2025-10-09 07:36:03,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2025-10-09 07:36:03,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2025-10-09 07:36:04,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2025-10-09 07:36:04,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:04,250 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push 2025-10-09 07:36:04,251 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes 2025-10-09 07:36:04,251 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2025-10-09 07:36:04,253 [ scc.git] DEBUG Check current status 2025-10-09 07:36:04,253 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:36:04,255 [ scc.git] DEBUG 72e9cee Fix title date in 2025-08-26.md 2025-10-09 07:36:04,255 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:36:04,290 [ scc.config] DEBUG Found remote.origin.url 2025-10-09 07:36:04,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None 2025-10-09 07:36:05,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2025-10-09 07:36:05,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2025-10-09 07:36:06,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2025-10-09 07:36:06,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2025-10-09 07:36:06,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:06,549 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push 2025-10-09 07:36:06,549 [ scc.git] DEBUG Resetting... 2025-10-09 07:36:06,549 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2025-10-09 07:36:06,556 [ scc.git] DEBUG HEAD is now at 93acbdea merge master -Dorg -Snone 2025-10-09 07:36:06,556 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2025-10-09 07:36:06,595 [ scc.git] DEBUG Check current status 2025-10-09 07:36:06,595 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2025-10-09 07:36:06,597 [ scc.git] DEBUG 93acbdea merge master -Dorg -Snone 2025-10-09 07:36:06,597 [ scc.git] DEBUG Calling 'git submodule status' 2025-10-09 07:36:06,639 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD) 2025-10-09 07:36:06,647 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD) 2025-10-09 07:36:06,647 [ scc.merge] INFO Merging Pull Request(s) based on master 2025-10-09 07:36:06,647 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2025-10-09 07:36:06,647 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2025-10-09 07:36:06,647 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2025-10-09 07:36:06,647 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2025-10-09 07:36:06,647 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2025-10-09 07:36:06,648 [ scc.repo] DEBUG ## PRs found: 2025-10-09 07:36:07,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None 2025-10-09 07:36:07,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831 HTTP/1.1" 200 None 2025-10-09 07:36:08,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f92cf8d4e958b22b26ccca61f92b87ae534293f4 HTTP/1.1" 200 None 2025-10-09 07:36:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f92cf8d4e958b22b26ccca61f92b87ae534293f4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2025-10-09 07:36:09,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f92cf8d4e958b22b26ccca61f92b87ae534293f4/check-suites?app_id=15368 HTTP/1.1" 200 None 2025-10-09 07:36:09,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f92cf8d4e958b22b26ccca61f92b87ae534293f4 HTTP/1.1" 200 None 2025-10-09 07:36:10,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/f92cf8d4e958b22b26ccca61f92b87ae534293f4?per_page=1 HTTP/1.1" 200 2 2025-10-09 07:36:10,019 [ scc.repo] DEBUG - PR 831 joshmoore 'Initial OME2026 page' 2025-10-09 07:36:10,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830 HTTP/1.1" 200 None 2025-10-09 07:36:11,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830/comments HTTP/1.1" 200 None 2025-10-09 07:36:11,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be HTTP/1.1" 200 None 2025-10-09 07:36:12,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2025-10-09 07:36:12,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be/check-suites?app_id=15368 HTTP/1.1" 200 None 2025-10-09 07:36:13,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be HTTP/1.1" 200 None 2025-10-09 07:36:13,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/39dabf0916ab32bafaac42868b9295eabb10a7be?per_page=1 HTTP/1.1" 200 2 2025-10-09 07:36:13,747 [ scc.repo] DEBUG - PR 830 joshmoore 'Update Josh headshot 🌳' 2025-10-09 07:36:14,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/829 HTTP/1.1" 200 None 2025-10-09 07:36:14,236 [ scc.repo] DEBUG # ... Include label: dependencies 2025-10-09 07:36:14,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5818270b4144a153c776154ad71b8f95ac8cd2be HTTP/1.1" 200 None 2025-10-09 07:36:15,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5818270b4144a153c776154ad71b8f95ac8cd2be/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2025-10-09 07:36:15,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5818270b4144a153c776154ad71b8f95ac8cd2be/check-suites?app_id=15368 HTTP/1.1" 200 None 2025-10-09 07:36:16,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5818270b4144a153c776154ad71b8f95ac8cd2be HTTP/1.1" 200 None 2025-10-09 07:36:16,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/5818270b4144a153c776154ad71b8f95ac8cd2be?per_page=1 HTTP/1.1" 200 2 2025-10-09 07:36:16,878 [ scc.repo] DEBUG - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' 2025-10-09 07:36:16,878 [ scc.repo] DEBUG ## Branches found: 2025-10-09 07:36:16,878 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:16,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:16,880 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2025-10-09 07:36:16,882 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2025-10-09 07:36:16,882 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2025-10-09 07:36:16,885 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2025-10-09 07:36:16,887 [ scc.git] DEBUG Already up to date. 2025-10-09 07:36:16,888 [ scc.git] DEBUG Calling 'git fetch origin pull/829/head' 2025-10-09 07:36:17,212 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:36:17,212 [ scc.git] DEBUG * branch refs/pull/829/head -> FETCH_HEAD 2025-10-09 07:36:17,228 [ scc.git] DEBUG Calling 'git fetch origin pull/830/head' 2025-10-09 07:36:17,545 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:36:17,545 [ scc.git] DEBUG * branch refs/pull/830/head -> FETCH_HEAD 2025-10-09 07:36:17,564 [ scc.git] DEBUG Calling 'git fetch origin pull/831/head' 2025-10-09 07:36:17,874 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org 2025-10-09 07:36:17,874 [ scc.git] DEBUG * branch refs/pull/831/head -> FETCH_HEAD 2025-10-09 07:36:17,889 [ scc.git] DEBUG ## Unique users: [] 2025-10-09 07:36:17,889 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:17,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:17,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5818270b4144a153c776154ad71b8f95ac8cd2be' 2025-10-09 07:36:17,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:17,896 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 829 (Bump Schemas from `24a3011` to `c4e38d1`) 5818270b4144a153c776154ad71b8f95ac8cd2be' 2025-10-09 07:36:17,898 [ scc.git] DEBUG Already up to date. 2025-10-09 07:36:18,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:36:18,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:36:18,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:18,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 830 (Update Josh headshot 🌳) 39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:36:18,069 [ scc.git] DEBUG Failed to merge submodule Schemas (commits don't follow merge-base) 2025-10-09 07:36:18,069 [ scc.git] DEBUG CONFLICT (submodule): Merge conflict in Schemas 2025-10-09 07:36:18,069 [ scc.git] DEBUG Recursive merging with submodules currently only supports trivial cases. 2025-10-09 07:36:18,069 [ scc.git] DEBUG Please manually handle the merging of each conflicted submodule. 2025-10-09 07:36:18,069 [ scc.git] DEBUG This can be accomplished with the following steps: 2025-10-09 07:36:18,069 [ scc.git] DEBUG - go to submodule (Schemas), and either merge commit 9dc8459 2025-10-09 07:36:18,069 [ scc.git] DEBUG or update to an existing commit which has merged those changes 2025-10-09 07:36:18,069 [ scc.git] DEBUG - come back to superproject and run: 2025-10-09 07:36:18,069 [ scc.git] DEBUG 2025-10-09 07:36:18,069 [ scc.git] DEBUG git add Schemas 2025-10-09 07:36:18,069 [ scc.git] DEBUG 2025-10-09 07:36:18,069 [ scc.git] DEBUG to record the above merge or update 2025-10-09 07:36:18,069 [ scc.git] DEBUG - resolve any other conflicts in the superproject 2025-10-09 07:36:18,069 [ scc.git] DEBUG - commit the resulting index in the superproject 2025-10-09 07:36:18,069 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2025-10-09 07:36:18,070 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2025-10-09 07:36:18,081 [ scc.git] DEBUG Calling 'git reset --hard 93acbdeaaf20a00544341a9ca973142b8a6569cb' 2025-10-09 07:36:18,087 [ scc.git] DEBUG HEAD is now at 93acbdea merge master -Dorg -Snone 2025-10-09 07:36:18,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:36:18,472 [ scc.git] DEBUG Calling 'git merge-base 93acbdeaaf20a00544341a9ca973142b8a6569cb 39dabf0916ab32bafaac42868b9295eabb10a7be' 2025-10-09 07:36:18,474 [ scc.git] DEBUG Calling 'git diff --name-only f3f69839a5b5cca7c070e7d3542fc6ef66528462..93acbdeaaf20a00544341a9ca973142b8a6569cb' 2025-10-09 07:36:18,477 [ scc.git] INFO - PR 830 joshmoore 'Update Josh headshot 🌳' Conflicting PR. Removed from build [WEBSITE-push#625](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/consoleText) for more details. Possible conflicts: - Upstream changes - Schemas --conflicts 2025-10-09 07:36:18,479 [ scc.config] DEBUG Found github.token 2025-10-09 07:36:18,479 [ scc.git] DEBUG Not adding comment to issue #830, already --conflicts. 2025-10-09 07:36:18,479 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f92cf8d4e958b22b26ccca61f92b87ae534293f4' 2025-10-09 07:36:18,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:18,483 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 831 (Initial OME2026 page) f92cf8d4e958b22b26ccca61f92b87ae534293f4' 2025-10-09 07:36:18,486 [ scc.git] DEBUG Already up to date. 2025-10-09 07:36:18,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:36:18,869 [ scc.git] DEBUG Calling 'git submodule update' 2025-10-09 07:36:18,905 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:18,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:18,907 [ scc.repo] DEBUG ## PRs found: 2025-10-09 07:36:19,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None 2025-10-09 07:36:19,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/12 HTTP/1.1" 200 None 2025-10-09 07:36:20,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/12/comments HTTP/1.1" 200 None 2025-10-09 07:36:20,367 [ scc.repo] DEBUG ## Branches found: 2025-10-09 07:36:20,368 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas 2025-10-09 07:36:20,368 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,370 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2025-10-09 07:36:20,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2025-10-09 07:36:20,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2025-10-09 07:36:20,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2025-10-09 07:36:20,378 [ scc.git] DEBUG Already up to date. 2025-10-09 07:36:20,378 [ scc.git] DEBUG ## Unique users: [] 2025-10-09 07:36:20,378 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,380 [ scc.git] DEBUG Calling 'git submodule update' 2025-10-09 07:36:20,415 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:20,450 [ scc.git] DEBUG Calling 'git status --porcelain' 2025-10-09 07:36:20,455 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9ecb20a10> has no local changes 2025-10-09 07:36:20,455 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/schemas Excluded PRs: - PR 12 joshmoore 'Update schemas doc pages' (stage: draft) Already up to date. Generated by WEBSITE-push#625 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/)' 2025-10-09 07:36:20,461 [ scc.git] DEBUG [detached HEAD aa6bf5b] merge master -Dorg -Ssuccess-only 2025-10-09 07:36:20,461 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push 2025-10-09 07:36:20,461 [ scc.repo] DEBUG ## PRs found: 2025-10-09 07:36:20,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2 2025-10-09 07:36:20,844 [ scc.repo] DEBUG ## Branches found: 2025-10-09 07:36:20,844 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes 2025-10-09 07:36:20,844 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,846 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2025-10-09 07:36:20,848 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2025-10-09 07:36:20,848 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2025-10-09 07:36:20,851 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2025-10-09 07:36:20,853 [ scc.git] DEBUG Already up to date. 2025-10-09 07:36:20,853 [ scc.git] DEBUG ## Unique users: [] 2025-10-09 07:36:20,853 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,855 [ scc.git] DEBUG Calling 'git submodule update' 2025-10-09 07:36:20,889 [ scc.git] DEBUG Get sha1 of %s 2025-10-09 07:36:20,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2025-10-09 07:36:20,891 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:20,925 [ scc.git] DEBUG Calling 'git status --porcelain' 2025-10-09 07:36:20,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9ecb3de50> has no local changes 2025-10-09 07:36:20,928 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/meeting-minutes Already up to date. Generated by WEBSITE-push#625 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/)' 2025-10-09 07:36:20,933 [ scc.git] DEBUG [detached HEAD 634e968] merge master -Dorg -Ssuccess-only 2025-10-09 07:36:20,934 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push 2025-10-09 07:36:20,934 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2025-10-09 07:36:20,971 [ scc.config] DEBUG Found submodule.Schemas.url 2025-10-09 07:36:21,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:36:21,274 [ scc.config] DEBUG Found submodule._minutes.url 2025-10-09 07:36:21,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2025-10-09 07:36:21,685 [ scc.git] DEBUG Calling 'git status --porcelain' 2025-10-09 07:36:21,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe9ecab7e10> has local changes 2025-10-09 07:36:21,699 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/www.openmicroscopy.org Already up to date. Merged PRs: - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' - PR 831 joshmoore 'Initial OME2026 page' Conflicting PRs (not included): - PR 830 joshmoore 'Update Josh headshot 🌳' Repository: ome/schemas Excluded PRs: - PR 12 joshmoore 'Update schemas doc pages' (stage: draft) Already up to date. Repository: ome/meeting-minutes Already up to date. Generated by WEBSITE-push#625 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/625/)' 2025-10-09 07:36:21,707 [ scc.git] DEBUG [detached HEAD d9900e87] merge master -Dorg -Ssuccess-only 2025-10-09 07:36:21,707 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 4 deletions(-) 2025-10-09 07:36:21,707 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org 2025-10-09 07:36:21,707 [ scc.merge] INFO Already up to date. 2025-10-09 07:36:21,707 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO Merged PRs: 2025-10-09 07:36:21,708 [ scc.merge] INFO - PR 829 dependabot[bot] 'Bump Schemas from `24a3011` to `c4e38d1`' 2025-10-09 07:36:21,708 [ scc.merge] INFO - PR 831 joshmoore 'Initial OME2026 page' 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO Conflicting PRs (not included): 2025-10-09 07:36:21,708 [ scc.merge] INFO - PR 830 joshmoore 'Update Josh headshot 🌳' 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO Repository: ome/schemas 2025-10-09 07:36:21,708 [ scc.merge] INFO Excluded PRs: 2025-10-09 07:36:21,708 [ scc.merge] INFO - PR 12 joshmoore 'Update schemas doc pages' (stage: draft) 2025-10-09 07:36:21,708 [ scc.merge] INFO Already up to date. 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO Repository: ome/meeting-minutes 2025-10-09 07:36:21,708 [ scc.merge] INFO Already up to date. 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] INFO 2025-10-09 07:36:21,708 [ scc.merge] DEBUG Cleaning remote branches created for merging 2025-10-09 07:36:21,708 [ scc.git] DEBUG Calling 'git remote' 2025-10-09 07:36:21,710 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas 2025-10-09 07:36:21,710 [ scc.git] DEBUG Calling 'git remote' 2025-10-09 07:36:21,712 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push 2025-10-09 07:36:21,712 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes 2025-10-09 07:36:21,712 [ scc.git] DEBUG Calling 'git remote' 2025-10-09 07:36:21,714 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push Update component versions python3.11: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory python3.11: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory python3.11: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory python3.11: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory grep: build.gradle: No such file or directory Up-to-date: Up-to-date: grep: build.gradle: No such file or directory Up-to-date: Up-to-date: Commit all component version changes Entering 'Schemas' Entering '_minutes' Entering 'Schemas' HEAD detached from c4e38d1 nothing to commit, working tree clean Entering '_minutes' HEAD detached from 72e9cee nothing to commit, working tree clean HEAD detached from f3f69839 nothing to commit, working tree clean 2025-10-09 07:36:38,655 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/www.openmicroscopy.org/tree/merge_ci [Pipeline] archiveArtifacts Archiving artifacts [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline Finished: SUCCESS