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 f061dff15033c5cd55249a383f52c15ca4a0e5cf
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 f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
Checking out Revision 00985ace9a13df3ff6979f6c6c7589746abe1ad9 (refs/remotes/origin/master)
Commit message: "Merge pull request #707 from pwalczysko/fix-uncomment"
> 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.39.3'
> 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 00985ace9a13df3ff6979f6c6c7589746abe1ad9 # timeout=10
> git rev-list --no-walk 00985ace9a13df3ff6979f6c6c7589746abe1ad9 # timeout=10
Cleaning workspace
[Pipeline] pwd
[Pipeline] sh
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> 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
+ 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 -
+ popd
~/workspace/WEBSITE-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' 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
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.0-py3-none-any.whl (2.1 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.0
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 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.6-py3-none-any.whl.metadata (23 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.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 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.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.11.0-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.3 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.19.1-py3-none-any.whl (48 kB)
Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB)
Using cached urllib3-1.26.18-py2.py3-none-any.whl (143 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.31.0-py3-none-any.whl (62 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.11.0-py3-none-any.whl (34 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.2.2-py3-none-any.whl (163 kB)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl (4.6 MB)
Using cached idna-3.7-py3-none-any.whl (66 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.2.2 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.5 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.31.0 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.19.1 six-1.16.0 typing-extensions-4.11.0 urllib3-1.26.18 wrapt-1.16.0 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 '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' 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
++ '[' -n /bin/bash -o -n '' ']'
++ 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)
2024-04-17 13:32:26,862 [ scc.config] DEBUG Found github.token
2024-04-17 13:32:26,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-17 13:32:27,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:27,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:27,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-17 13:32:27,930 [ scc.gh] DEBUG 4788 remaining from 5000 (Reset at 13:04
2024-04-17 13:32:27,931 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 13:32:27,934 [ scc.git] DEBUG Check current status
2024-04-17 13:32:27,934 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:27,937 [ scc.git] DEBUG 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 13:32:27,937 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:27,976 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 13:32:27,985 [ scc.git] DEBUG 76e3b8e265852480bd45dfed53ff63b0c1727f82 _minutes (heads/master-3-g76e3b8e)
2024-04-17 13:32:27,988 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 13:32:28,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-04-17 13:32:28,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 13:32:29,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 13:32:29,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 13:32:30,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 13:32:30,148 [ scc.git] DEBUG Resetting...
2024-04-17 13:32:30,148 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-17 13:32:30,156 [ scc.git] DEBUG HEAD is now at 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 13:32:30,156 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-17 13:32:30,192 [ scc.git] DEBUG Check current status
2024-04-17 13:32:30,193 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:30,196 [ scc.git] DEBUG 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 13:32:30,196 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:30,234 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 13:32:30,242 [ scc.git] DEBUG 76e3b8e265852480bd45dfed53ff63b0c1727f82 _minutes (heads/master-3-g76e3b8e)
2024-04-17 13:32:30,243 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-17 13:32:30,243 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-17 13:32:30,243 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-17 13:32:30,243 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-17 13:32:30,243 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-17 13:32:30,243 [ scc.repo] DEBUG ## PRs found:
2024-04-17 13:32:30,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-04-17 13:32:31,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709 HTTP/1.1" 200 None
2024-04-17 13:32:31,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709/comments HTTP/1.1" 200 None
2024-04-17 13:32:31,570 [ scc.repo] DEBUG - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 13:32:32,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708 HTTP/1.1" 200 None
2024-04-17 13:32:32,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708/comments HTTP/1.1" 200 None
2024-04-17 13:32:32,489 [ scc.repo] DEBUG - PR 708 pwalczysko 'Community meeting'
2024-04-17 13:32:32,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/706 HTTP/1.1" 200 None
2024-04-17 13:32:32,952 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 13:32:32,952 [ scc.repo] DEBUG - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 13:32:33,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-04-17 13:32:33,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-04-17 13:32:33,944 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 13:32:33,944 [ scc.repo] DEBUG ## Branches found:
2024-04-17 13:32:33,944 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:32:33,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:33,948 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 13:32:33,951 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 13:32:33,951 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 13:32:33,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 13:32:33,958 [ scc.git] DEBUG Already up to date.
2024-04-17 13:32:33,958 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-04-17 13:32:34,367 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:32:34,368 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-04-17 13:32:34,380 [ scc.git] DEBUG Calling 'git fetch origin pull/706/head'
2024-04-17 13:32:34,783 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:32:34,783 [ scc.git] DEBUG * branch refs/pull/706/head -> FETCH_HEAD
2024-04-17 13:32:34,792 [ scc.git] DEBUG Calling 'git fetch origin pull/708/head'
2024-04-17 13:32:35,416 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:32:35,416 [ scc.git] DEBUG * branch refs/pull/708/head -> FETCH_HEAD
2024-04-17 13:32:35,421 [ scc.git] DEBUG Calling 'git fetch origin pull/709/head'
2024-04-17 13:32:35,804 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:32:35,804 [ scc.git] DEBUG * branch refs/pull/709/head -> FETCH_HEAD
2024-04-17 13:32:35,814 [ scc.git] DEBUG ## Unique users: []
2024-04-17 13:32:35,814 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:32:35,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:35,817 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 13:32:35,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:35,828 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 13:32:35,845 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 13:32:35,847 [ scc.git] DEBUG img/logos/idr-logos.zip | Bin 17681 -> 16406 bytes
2024-04-17 13:32:35,847 [ scc.git] DEBUG 1 file changed, 0 insertions(+), 0 deletions(-)
2024-04-17 13:32:35,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:36,000 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 13:32:36,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:36,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 706 (Bump _minutes from `76e3b8e` to `4e536b4`) 197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 13:32:36,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 13:32:36,028 [ scc.git] DEBUG _minutes | 2 +-
2024-04-17 13:32:36,028 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-17 13:32:36,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:36,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9970c6a516f0eb795403cbaf6071fb7ba4302f05'
2024-04-17 13:32:36,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:36,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 708 (Community meeting) 9970c6a516f0eb795403cbaf6071fb7ba4302f05'
2024-04-17 13:32:36,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 13:32:36,444 [ scc.git] DEBUG _data/ome2024.json | 1620 ++++++++++++++++++++++
2024-04-17 13:32:36,444 [ scc.git] DEBUG _layouts/ome-community-meeting-program-2024.html | 32 +
2024-04-17 13:32:36,444 [ scc.git] DEBUG build.sh | 2 +-
2024-04-17 13:32:36,444 [ scc.git] DEBUG events/index.html | 6 +
2024-04-17 13:32:36,444 [ scc.git] DEBUG events/ome-community-meeting-2024/index.html | 77 +
2024-04-17 13:32:36,444 [ scc.git] DEBUG index.html | 10 +-
2024-04-17 13:32:36,444 [ scc.git] DEBUG 6 files changed, 1741 insertions(+), 6 deletions(-)
2024-04-17 13:32:36,444 [ scc.git] DEBUG create mode 100644 _data/ome2024.json
2024-04-17 13:32:36,444 [ scc.git] DEBUG create mode 100644 _layouts/ome-community-meeting-program-2024.html
2024-04-17 13:32:36,444 [ scc.git] DEBUG create mode 100644 events/ome-community-meeting-2024/index.html
2024-04-17 13:32:36,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:36,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:32:36,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:36,817 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 709 (Only rework main index page, just reformulate and add eventbrite) d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:32:36,833 [ scc.git] DEBUG Auto-merging build.sh
2024-04-17 13:32:36,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.sh
2024-04-17 13:32:36,834 [ scc.git] DEBUG Auto-merging index.html
2024-04-17 13:32:36,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in index.html
2024-04-17 13:32:36,834 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-17 13:32:36,834 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-17 13:32:36,842 [ scc.git] DEBUG Calling 'git reset --hard bb390ee8b7ace726e1801f4a9e11730c9c1d6040'
2024-04-17 13:32:36,849 [ scc.git] DEBUG HEAD is now at bb390ee merge master -Dorg -Snone: PR 708 (Community meeting)
2024-04-17 13:32:37,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:37,214 [ scc.git] DEBUG Calling 'git merge-base 00985ace9a13df3ff6979f6c6c7589746abe1ad9 d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:32:37,217 [ scc.git] DEBUG Calling 'git diff --name-only 00985ace9a13df3ff6979f6c6c7589746abe1ad9..00985ace9a13df3ff6979f6c6c7589746abe1ad9'
2024-04-17 13:32:37,221 [ scc.git] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Conflicting PR. Removed from build [WEBSITE-push#51](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/consoleText) for more details.
Possible conflicts:
- PR #708 pwalczysko 'Community meeting'
- build.sh
- index.html
--conflicts
2024-04-17 13:32:37,223 [ scc.config] DEBUG Found github.token
2024-04-17 13:32:37,224 [ scc.git] DEBUG Adding comment to issue #709.
2024-04-17 13:32:38,126 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/www.openmicroscopy.org/issues/709/comments HTTP/1.1" 201 2006
2024-04-17 13:32:38,127 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 13:32:39,928 [ scc.git] DEBUG Submodule path '_minutes': checked out '4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c'
2024-04-17 13:32:39,929 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:32:39,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:32:39,933 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 13:32:40,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f431719f520> has no local changes
2024-04-17 13:32:40,090 [ 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 545 sbesson 'Regenerate IDR PNG logos with transparent background'
- PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
- PR 708 pwalczysko 'Community meeting'
Conflicting PRs (not included):
- PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Generated by WEBSITE-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/)'
2024-04-17 13:32:40,127 [ scc.git] DEBUG [detached HEAD a2a1e85] merge master -Dorg -Snone
2024-04-17 13:32:40,127 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-04-17 13:32:40,127 [ scc.merge] INFO Already up to date.
2024-04-17 13:32:40,127 [ scc.merge] INFO
2024-04-17 13:32:40,127 [ scc.merge] INFO Merged PRs:
2024-04-17 13:32:40,127 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 13:32:40,127 [ scc.merge] INFO - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 13:32:40,127 [ scc.merge] INFO - PR 708 pwalczysko 'Community meeting'
2024-04-17 13:32:40,128 [ scc.merge] INFO
2024-04-17 13:32:40,128 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-17 13:32:40,128 [ scc.merge] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 13:32:40,128 [ scc.merge] INFO
2024-04-17 13:32:40,128 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-17 13:32:40,128 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'Schemas'
Synchronizing submodule url for '_minutes'
Merge all submodules2024-04-17 13:32:41,266 [ scc.config] DEBUG Found github.token
2024-04-17 13:32:41,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-17 13:32:41,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:41,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:32:42,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-17 13:32:42,290 [ scc.gh] DEBUG 4768 remaining from 5000 (Reset at 13:04
2024-04-17 13:32:42,291 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 13:32:42,294 [ scc.git] DEBUG Check current status
2024-04-17 13:32:42,294 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:42,297 [ scc.git] DEBUG a2a1e85 merge master -Dorg -Snone
2024-04-17 13:32:42,297 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:42,336 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 13:32:42,343 [ scc.git] DEBUG 4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c _minutes (remotes/origin/HEAD)
2024-04-17 13:32:42,346 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 13:32:42,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-04-17 13:32:43,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 13:32:43,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 13:32:44,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 13:32:44,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 13:32:44,491 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:32:44,527 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 13:32:44,527 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 13:32:44,530 [ scc.git] DEBUG Check current status
2024-04-17 13:32:44,530 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:44,533 [ scc.git] DEBUG 9dc8459 Generate Schemas pages
2024-04-17 13:32:44,533 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:44,567 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 13:32:44,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None
2024-04-17 13:32:45,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 13:32:45,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 13:32:46,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 13:32:46,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 13:32:46,702 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:32:46,734 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 13:32:46,735 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 13:32:46,735 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 13:32:46,738 [ scc.git] DEBUG Check current status
2024-04-17 13:32:46,738 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:46,741 [ scc.git] DEBUG 4e536b4 Adding 2024-04-09.md
2024-04-17 13:32:46,741 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:46,776 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 13:32:47,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None
2024-04-17 13:32:47,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 13:32:48,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 13:32:48,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 13:32:48,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 13:32:48,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:32:48,921 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 13:32:48,922 [ scc.git] DEBUG Resetting...
2024-04-17 13:32:48,922 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-17 13:32:48,928 [ scc.git] DEBUG HEAD is now at a2a1e85 merge master -Dorg -Snone
2024-04-17 13:32:48,928 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-17 13:32:48,965 [ scc.git] DEBUG Check current status
2024-04-17 13:32:48,966 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 13:32:48,969 [ scc.git] DEBUG a2a1e85 merge master -Dorg -Snone
2024-04-17 13:32:48,969 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 13:32:49,007 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 13:32:49,014 [ scc.git] DEBUG 4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c _minutes (remotes/origin/HEAD)
2024-04-17 13:32:49,015 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-17 13:32:49,015 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-17 13:32:49,015 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-17 13:32:49,015 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-17 13:32:49,015 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-17 13:32:49,015 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-17 13:32:49,015 [ scc.repo] DEBUG ## PRs found:
2024-04-17 13:32:49,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-04-17 13:32:49,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709 HTTP/1.1" 200 None
2024-04-17 13:32:50,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709/comments HTTP/1.1" 200 None
2024-04-17 13:32:50,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92 HTTP/1.1" 200 None
2024-04-17 13:32:51,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 13:32:51,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-17 13:32:52,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92 HTTP/1.1" 200 None
2024-04-17 13:32:52,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/d6b6fdf27cb09a91568dac3453d0e7be26e08d92?per_page=1 HTTP/1.1" 200 2
2024-04-17 13:32:52,622 [ scc.repo] DEBUG - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 13:32:53,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708 HTTP/1.1" 200 None
2024-04-17 13:32:53,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708/comments HTTP/1.1" 200 None
2024-04-17 13:32:54,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9970c6a516f0eb795403cbaf6071fb7ba4302f05 HTTP/1.1" 200 None
2024-04-17 13:32:54,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9970c6a516f0eb795403cbaf6071fb7ba4302f05/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 13:32:55,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9970c6a516f0eb795403cbaf6071fb7ba4302f05/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-17 13:32:55,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/706 HTTP/1.1" 200 None
2024-04-17 13:32:55,483 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 13:32:55,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc HTTP/1.1" 200 None
2024-04-17 13:32:56,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 13:32:56,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-17 13:32:57,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc HTTP/1.1" 200 None
2024-04-17 13:32:57,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc?per_page=1 HTTP/1.1" 200 2
2024-04-17 13:32:57,823 [ scc.repo] DEBUG - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 13:32:58,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-04-17 13:32:58,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-04-17 13:32:59,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-04-17 13:32:59,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 13:33:00,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-04-17 13:33:00,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/f3b02a9cd75d1c017d06a12bde07c6adce10cabd?per_page=1 HTTP/1.1" 200 2
2024-04-17 13:33:00,672 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 13:33:00,672 [ scc.repo] DEBUG ## Branches found:
2024-04-17 13:33:00,672 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:00,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:00,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 13:33:00,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 13:33:00,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 13:33:00,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 13:33:00,691 [ scc.git] DEBUG Already up to date.
2024-04-17 13:33:00,691 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-04-17 13:33:01,105 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:33:01,106 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-04-17 13:33:01,119 [ scc.git] DEBUG Calling 'git fetch origin pull/706/head'
2024-04-17 13:33:01,734 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:33:01,734 [ scc.git] DEBUG * branch refs/pull/706/head -> FETCH_HEAD
2024-04-17 13:33:01,744 [ scc.git] DEBUG Calling 'git fetch origin pull/709/head'
2024-04-17 13:33:02,161 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 13:33:02,162 [ scc.git] DEBUG * branch refs/pull/709/head -> FETCH_HEAD
2024-04-17 13:33:02,171 [ scc.git] DEBUG ## Unique users: []
2024-04-17 13:33:02,172 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:02,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:02,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 13:33:02,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:02,187 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 13:33:02,195 [ scc.git] DEBUG Already up to date.
2024-04-17 13:33:02,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:02,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 13:33:02,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:02,374 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 706 (Bump _minutes from `76e3b8e` to `4e536b4`) 197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 13:33:02,381 [ scc.git] DEBUG Already up to date.
2024-04-17 13:33:02,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:02,779 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:33:02,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:02,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 709 (Only rework main index page, just reformulate and add eventbrite) d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:33:02,805 [ scc.git] DEBUG Auto-merging build.sh
2024-04-17 13:33:02,805 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.sh
2024-04-17 13:33:02,805 [ scc.git] DEBUG Auto-merging index.html
2024-04-17 13:33:02,805 [ scc.git] DEBUG CONFLICT (content): Merge conflict in index.html
2024-04-17 13:33:02,805 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-17 13:33:02,806 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-17 13:33:02,816 [ scc.git] DEBUG Calling 'git reset --hard a2a1e854575af90ddbc2a13161140a000dc81cae'
2024-04-17 13:33:02,822 [ scc.git] DEBUG HEAD is now at a2a1e85 merge master -Dorg -Snone
2024-04-17 13:33:03,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:03,190 [ scc.git] DEBUG Calling 'git merge-base a2a1e854575af90ddbc2a13161140a000dc81cae d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 13:33:03,198 [ scc.git] DEBUG Calling 'git diff --name-only 00985ace9a13df3ff6979f6c6c7589746abe1ad9..a2a1e854575af90ddbc2a13161140a000dc81cae'
2024-04-17 13:33:03,202 [ scc.git] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Conflicting PR. Removed from build [WEBSITE-push#51](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/consoleText) for more details.
Possible conflicts:
- Upstream changes
- build.sh
- index.html
--conflicts
2024-04-17 13:33:03,204 [ scc.config] DEBUG Found github.token
2024-04-17 13:33:03,205 [ scc.git] DEBUG Adding comment to issue #709.
2024-04-17 13:33:04,057 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/www.openmicroscopy.org/issues/709/comments HTTP/1.1" 201 1984
2024-04-17 13:33:04,058 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 13:33:04,090 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:04,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:04,093 [ scc.repo] DEBUG ## PRs found:
2024-04-17 13:33:04,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None
2024-04-17 13:33:04,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/10 HTTP/1.1" 200 None
2024-04-17 13:33:04,999 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 13:33:05,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-04-17 13:33:05,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 13:33:06,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-17 13:33:06,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-04-17 13:33:07,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/statuses/e1257555be50189441800592768cdfbb3e9dc48c?per_page=1 HTTP/1.1" 200 2
2024-04-17 13:33:07,312 [ scc.repo] DEBUG - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-04-17 13:33:07,312 [ scc.repo] DEBUG ## Branches found:
2024-04-17 13:33:07,312 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 13:33:07,312 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:07,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:07,316 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 13:33:07,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 13:33:07,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 13:33:07,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 13:33:07,326 [ scc.git] DEBUG Already up to date.
2024-04-17 13:33:07,326 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-17 13:33:07,693 [ scc.git] DEBUG From https://github.com/ome/schemas
2024-04-17 13:33:07,693 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-17 13:33:07,696 [ scc.git] DEBUG ## Unique users: []
2024-04-17 13:33:07,696 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:07,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:07,700 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e1257555be50189441800592768cdfbb3e9dc48c'
2024-04-17 13:33:07,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:07,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Bump specification from 6.3.1 to 6.3.3) e1257555be50189441800592768cdfbb3e9dc48c'
2024-04-17 13:33:07,714 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 13:33:07,716 [ scc.git] DEBUG pom.xml | 2 +-
2024-04-17 13:33:07,716 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-17 13:33:07,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:07,884 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 13:33:07,917 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:07,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:07,920 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:33:07,952 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 13:33:07,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3adb2e550> has no local changes
2024-04-17 13:33:07,957 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/schemas
Already up to date.
Merged PRs:
- PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
Generated by WEBSITE-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/)'
2024-04-17 13:33:07,964 [ scc.git] DEBUG [detached HEAD 3e42c78] merge master -Dorg -Ssuccess-only
2024-04-17 13:33:07,964 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 13:33:07,964 [ scc.repo] DEBUG ## PRs found:
2024-04-17 13:33:08,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2
2024-04-17 13:33:08,326 [ scc.repo] DEBUG ## Branches found:
2024-04-17 13:33:08,326 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 13:33:08,326 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:08,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:08,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 13:33:08,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 13:33:08,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 13:33:08,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 13:33:08,340 [ scc.git] DEBUG Already up to date.
2024-04-17 13:33:08,340 [ scc.git] DEBUG ## Unique users: []
2024-04-17 13:33:08,340 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:08,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:08,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 13:33:08,375 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 13:33:08,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 13:33:08,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:33:08,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 13:33:08,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3adb2e580> has no local changes
2024-04-17 13:33:08,414 [ 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#51 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/)'
2024-04-17 13:33:08,421 [ scc.git] DEBUG [detached HEAD 20a1361] merge master -Dorg -Ssuccess-only
2024-04-17 13:33:08,421 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 13:33:08,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 13:33:08,457 [ scc.config] DEBUG Found submodule.Schemas.url
2024-04-17 13:33:08,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:08,760 [ scc.config] DEBUG Found submodule._minutes.url
2024-04-17 13:33:09,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 13:33:09,170 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 13:33:09,184 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc3aebebeb0> has local changes
2024-04-17 13:33:09,184 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/www.openmicroscopy.org
Excluded PRs:
- PR 708 pwalczysko 'Community meeting' (status: None)
Already up to date.
Merged PRs:
- PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
- PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
Conflicting PRs (not included):
- PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Repository: ome/schemas
Already up to date.
Merged PRs:
- PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
Repository: ome/meeting-minutes
Already up to date.
Generated by WEBSITE-push#51 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/51/)'
2024-04-17 13:33:09,192 [ scc.git] DEBUG [detached HEAD ae58093] merge master -Dorg -Ssuccess-only
2024-04-17 13:33:09,192 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-04-17 13:33:09,192 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 4 deletions(-)
2024-04-17 13:33:09,192 [ scc.merge] INFO Excluded PRs:
2024-04-17 13:33:09,192 [ scc.merge] INFO - PR 708 pwalczysko 'Community meeting' (status: None)
2024-04-17 13:33:09,192 [ scc.merge] INFO Already up to date.
2024-04-17 13:33:09,192 [ scc.merge] INFO
2024-04-17 13:33:09,192 [ scc.merge] INFO Merged PRs:
2024-04-17 13:33:09,192 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 13:33:09,192 [ scc.merge] INFO - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-17 13:33:09,193 [ scc.merge] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] INFO Repository: ome/schemas
2024-04-17 13:33:09,193 [ scc.merge] INFO Already up to date.
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] INFO Merged PRs:
2024-04-17 13:33:09,193 [ scc.merge] INFO - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] INFO Repository: ome/meeting-minutes
2024-04-17 13:33:09,193 [ scc.merge] INFO Already up to date.
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] INFO
2024-04-17 13:33:09,193 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-17 13:33:09,193 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 13:33:09,196 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 13:33:09,196 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 13:33:09,199 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 13:33:09,199 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 13:33:09,199 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 13:33:09,202 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
Update component versions
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
python3: 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 9dc8459
nothing to commit, working tree clean
Entering '_minutes'
HEAD detached from 4e536b4
nothing to commit, working tree clean
HEAD detached from 00985ac
nothing to commit, working tree clean
2024-04-17 13:33:23,660 [ 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