Console Output
+ 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 10:29:02,222 [ scc.config] DEBUG Found github.token
2024-04-17 10:29:02,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-17 10:29:02,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:02,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:03,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-17 10:29:03,343 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 11:04
2024-04-17 10:29:03,343 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 10:29:03,346 [ scc.git] DEBUG Check current status
2024-04-17 10:29:03,346 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:03,349 [ scc.git] DEBUG 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 10:29:03,349 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:03,388 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 10:29:03,397 [ scc.git] DEBUG 76e3b8e265852480bd45dfed53ff63b0c1727f82 _minutes (heads/master-3-g76e3b8e)
2024-04-17 10:29:03,400 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 10:29:03,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-04-17 10:29:04,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 10:29:04,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 10:29:05,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 10:29:05,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 10:29:05,608 [ scc.git] DEBUG Resetting...
2024-04-17 10:29:05,608 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-17 10:29:05,615 [ scc.git] DEBUG HEAD is now at 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 10:29:05,616 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-17 10:29:05,652 [ scc.git] DEBUG Check current status
2024-04-17 10:29:05,652 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:05,655 [ scc.git] DEBUG 00985ac Merge pull request #707 from pwalczysko/fix-uncomment
2024-04-17 10:29:05,655 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:05,693 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 10:29:05,702 [ scc.git] DEBUG 76e3b8e265852480bd45dfed53ff63b0c1727f82 _minutes (heads/master-3-g76e3b8e)
2024-04-17 10:29:05,702 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-17 10:29:05,702 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-17 10:29:05,702 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-17 10:29:05,702 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-17 10:29:05,702 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-17 10:29:05,702 [ scc.repo] DEBUG ## PRs found:
2024-04-17 10:29:06,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-04-17 10:29:06,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709 HTTP/1.1" 200 None
2024-04-17 10:29:07,051 [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 10:29:07,052 [ scc.repo] DEBUG - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 10:29:07,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708 HTTP/1.1" 200 None
2024-04-17 10:29:07,980 [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 10:29:07,980 [ scc.repo] DEBUG - PR 708 pwalczysko 'Community meeting'
2024-04-17 10:29:08,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/706 HTTP/1.1" 200 None
2024-04-17 10:29:08,487 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 10:29:08,487 [ scc.repo] DEBUG - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 10:29:08,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-04-17 10:29:09,429 [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 10:29:09,430 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 10:29:09,430 [ scc.repo] DEBUG ## Branches found:
2024-04-17 10:29:09,430 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:09,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:09,433 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 10:29:09,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 10:29:09,436 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 10:29:09,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 10:29:09,443 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:09,443 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-04-17 10:29:09,851 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:09,851 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-04-17 10:29:09,863 [ scc.git] DEBUG Calling 'git fetch origin pull/706/head'
2024-04-17 10:29:10,261 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:10,261 [ scc.git] DEBUG * branch refs/pull/706/head -> FETCH_HEAD
2024-04-17 10:29:10,270 [ scc.git] DEBUG Calling 'git fetch origin pull/708/head'
2024-04-17 10:29:10,847 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:10,847 [ scc.git] DEBUG * branch refs/pull/708/head -> FETCH_HEAD
2024-04-17 10:29:10,851 [ scc.git] DEBUG Calling 'git fetch origin pull/709/head'
2024-04-17 10:29:11,438 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:11,438 [ scc.git] DEBUG * branch refs/pull/709/head -> FETCH_HEAD
2024-04-17 10:29:11,440 [ scc.git] DEBUG ## Unique users: []
2024-04-17 10:29:11,441 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:11,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:11,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 10:29:11,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:11,454 [ 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 10:29:11,470 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 10:29:11,472 [ scc.git] DEBUG img/logos/idr-logos.zip | Bin 17681 -> 16406 bytes
2024-04-17 10:29:11,472 [ scc.git] DEBUG 1 file changed, 0 insertions(+), 0 deletions(-)
2024-04-17 10:29:11,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:11,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 10:29:11,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:11,641 [ 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 10:29:11,656 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 10:29:11,658 [ scc.git] DEBUG _minutes | 2 +-
2024-04-17 10:29:11,658 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-17 10:29:12,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:12,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...90e636a2e6ec13d78e3bd0788a484722606ff28e'
2024-04-17 10:29:12,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:12,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 708 (Community meeting) 90e636a2e6ec13d78e3bd0788a484722606ff28e'
2024-04-17 10:29:12,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 10:29:12,078 [ scc.git] DEBUG _data/ome2024.json | 1711 ++++++++++++++++++++++
2024-04-17 10:29:12,078 [ scc.git] DEBUG _layouts/ome-community-meeting-program-2024.html | 32 +
2024-04-17 10:29:12,078 [ scc.git] DEBUG build.sh | 2 +-
2024-04-17 10:29:12,078 [ scc.git] DEBUG events/index.html | 6 +
2024-04-17 10:29:12,078 [ scc.git] DEBUG events/ome-community-meeting-2024/index.html | 77 +
2024-04-17 10:29:12,078 [ scc.git] DEBUG index.html | 10 +-
2024-04-17 10:29:12,078 [ scc.git] DEBUG 6 files changed, 1832 insertions(+), 6 deletions(-)
2024-04-17 10:29:12,078 [ scc.git] DEBUG create mode 100644 _data/ome2024.json
2024-04-17 10:29:12,078 [ scc.git] DEBUG create mode 100644 _layouts/ome-community-meeting-program-2024.html
2024-04-17 10:29:12,078 [ scc.git] DEBUG create mode 100644 events/ome-community-meeting-2024/index.html
2024-04-17 10:29:12,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:12,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 10:29:12,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:12,477 [ 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 10:29:12,494 [ scc.git] DEBUG Auto-merging build.sh
2024-04-17 10:29:12,494 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.sh
2024-04-17 10:29:12,494 [ scc.git] DEBUG Auto-merging index.html
2024-04-17 10:29:12,494 [ scc.git] DEBUG CONFLICT (content): Merge conflict in index.html
2024-04-17 10:29:12,494 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-17 10:29:12,494 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-17 10:29:12,503 [ scc.git] DEBUG Calling 'git reset --hard 11ffd077e2cbce7257125dcad01c144e8e4069af'
2024-04-17 10:29:12,510 [ scc.git] DEBUG HEAD is now at 11ffd07 merge master -Dorg -Snone: PR 708 (Community meeting)
2024-04-17 10:29:12,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:12,864 [ scc.git] DEBUG Calling 'git merge-base 00985ace9a13df3ff6979f6c6c7589746abe1ad9 d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 10:29:12,867 [ scc.git] DEBUG Calling 'git diff --name-only 00985ace9a13df3ff6979f6c6c7589746abe1ad9..00985ace9a13df3ff6979f6c6c7589746abe1ad9'
2024-04-17 10:29:12,870 [ scc.git] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Conflicting PR. Removed from build [WEBSITE-push#48](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/consoleText) for more details.
Possible conflicts:
- PR #708 pwalczysko 'Community meeting'
- build.sh
- index.html
--conflicts
2024-04-17 10:29:12,873 [ scc.config] DEBUG Found github.token
2024-04-17 10:29:12,873 [ scc.git] DEBUG Adding comment to issue #709.
2024-04-17 10:29:13,762 [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 10:29:13,763 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 10:29:13,804 [ scc.git] DEBUG Submodule path '_minutes': checked out '4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c'
2024-04-17 10:29:13,804 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:13,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:13,807 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 10:29:13,821 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f062bbe0340> has no local changes
2024-04-17 10:29:13,821 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/)'
2024-04-17 10:29:13,834 [ scc.git] DEBUG [detached HEAD 7c84e3a] merge master -Dorg -Snone
2024-04-17 10:29:13,834 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-04-17 10:29:13,834 [ scc.merge] INFO Already up to date.
2024-04-17 10:29:13,834 [ scc.merge] INFO
2024-04-17 10:29:13,835 [ scc.merge] INFO Merged PRs:
2024-04-17 10:29:13,835 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 10:29:13,835 [ scc.merge] INFO - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 10:29:13,835 [ scc.merge] INFO - PR 708 pwalczysko 'Community meeting'
2024-04-17 10:29:13,835 [ scc.merge] INFO
2024-04-17 10:29:13,835 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-17 10:29:13,835 [ scc.merge] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 10:29:13,835 [ scc.merge] INFO
2024-04-17 10:29:13,835 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-17 10:29:13,835 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'Schemas'
Synchronizing submodule url for '_minutes'
Merge all submodules2024-04-17 10:29:14,972 [ scc.config] DEBUG Found github.token
2024-04-17 10:29:14,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-17 10:29:15,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:15,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:16,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-17 10:29:16,027 [ scc.gh] DEBUG 4976 remaining from 5000 (Reset at 11:04
2024-04-17 10:29:16,028 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 10:29:16,031 [ scc.git] DEBUG Check current status
2024-04-17 10:29:16,031 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:16,034 [ scc.git] DEBUG 7c84e3a merge master -Dorg -Snone
2024-04-17 10:29:16,034 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:16,073 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 10:29:16,080 [ scc.git] DEBUG 4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c _minutes (remotes/origin/HEAD)
2024-04-17 10:29:16,083 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 10:29:16,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-04-17 10:29:16,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 10:29:17,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 10:29:17,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 10:29:18,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 10:29:18,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:18,280 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 10:29:18,280 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 10:29:18,283 [ scc.git] DEBUG Check current status
2024-04-17 10:29:18,283 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:18,286 [ scc.git] DEBUG 9dc8459 Generate Schemas pages
2024-04-17 10:29:18,286 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:18,320 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 10:29:18,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None
2024-04-17 10:29:19,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 10:29:19,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 10:29:20,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 10:29:20,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 10:29:20,514 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:20,547 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 10:29:20,548 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 10:29:20,548 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-17 10:29:20,551 [ scc.git] DEBUG Check current status
2024-04-17 10:29:20,551 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:20,554 [ scc.git] DEBUG 4e536b4 Adding 2024-04-09.md
2024-04-17 10:29:20,554 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:20,588 [ scc.config] DEBUG Found remote.origin.url
2024-04-17 10:29:20,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None
2024-04-17 10:29:21,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-17 10:29:21,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-17 10:29:22,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-17 10:29:22,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-17 10:29:22,717 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:22,749 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 10:29:22,749 [ scc.git] DEBUG Resetting...
2024-04-17 10:29:22,749 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-17 10:29:22,756 [ scc.git] DEBUG HEAD is now at 7c84e3a merge master -Dorg -Snone
2024-04-17 10:29:22,756 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-17 10:29:23,448 [ scc.git] DEBUG Check current status
2024-04-17 10:29:23,449 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-17 10:29:23,451 [ scc.git] DEBUG 7c84e3a merge master -Dorg -Snone
2024-04-17 10:29:23,452 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-17 10:29:23,490 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-04-17 10:29:23,497 [ scc.git] DEBUG 4e536b4c6e1bd2e9c35217ef148dfddb64ce3f3c _minutes (remotes/origin/HEAD)
2024-04-17 10:29:23,498 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-17 10:29:23,498 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-17 10:29:23,498 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-17 10:29:23,498 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-17 10:29:23,498 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-17 10:29:23,498 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-17 10:29:23,498 [ scc.repo] DEBUG ## PRs found:
2024-04-17 10:29:23,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-04-17 10:29:24,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/709 HTTP/1.1" 200 None
2024-04-17 10:29:24,725 [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 10:29:25,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92 HTTP/1.1" 200 None
2024-04-17 10:29:25,683 [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 10:29:26,147 [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 10:29:26,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d6b6fdf27cb09a91568dac3453d0e7be26e08d92 HTTP/1.1" 200 None
2024-04-17 10:29:27,038 [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 10:29:27,038 [ scc.repo] DEBUG - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 10:29:27,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/708 HTTP/1.1" 200 None
2024-04-17 10:29:27,982 [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 10:29:28,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/90e636a2e6ec13d78e3bd0788a484722606ff28e HTTP/1.1" 200 None
2024-04-17 10:29:28,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/90e636a2e6ec13d78e3bd0788a484722606ff28e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-17 10:29:29,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/90e636a2e6ec13d78e3bd0788a484722606ff28e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-17 10:29:29,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/90e636a2e6ec13d78e3bd0788a484722606ff28e HTTP/1.1" 200 None
2024-04-17 10:29:30,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/90e636a2e6ec13d78e3bd0788a484722606ff28e?per_page=1 HTTP/1.1" 200 2
2024-04-17 10:29:30,245 [ scc.repo] DEBUG - PR 708 pwalczysko 'Community meeting'
2024-04-17 10:29:30,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/706 HTTP/1.1" 200 None
2024-04-17 10:29:30,723 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 10:29:31,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc HTTP/1.1" 200 None
2024-04-17 10:29:31,742 [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 10:29:32,256 [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 10:29:32,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/197c2a2fc5fb1da081e4d60a70e0fe36164c08dc HTTP/1.1" 200 None
2024-04-17 10:29:33,120 [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 10:29:33,121 [ scc.repo] DEBUG - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 10:29:33,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-04-17 10:29:34,042 [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 10:29:34,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-04-17 10:29:34,981 [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 10:29:35,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-04-17 10:29:35,871 [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 10:29:35,872 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 10:29:35,872 [ scc.repo] DEBUG ## Branches found:
2024-04-17 10:29:35,872 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:35,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:35,876 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 10:29:35,879 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 10:29:35,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 10:29:35,882 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 10:29:35,890 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:35,891 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-04-17 10:29:36,310 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:36,310 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-04-17 10:29:36,322 [ scc.git] DEBUG Calling 'git fetch origin pull/706/head'
2024-04-17 10:29:36,733 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:36,733 [ scc.git] DEBUG * branch refs/pull/706/head -> FETCH_HEAD
2024-04-17 10:29:36,742 [ scc.git] DEBUG Calling 'git fetch origin pull/708/head'
2024-04-17 10:29:37,221 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:37,222 [ scc.git] DEBUG * branch refs/pull/708/head -> FETCH_HEAD
2024-04-17 10:29:37,233 [ scc.git] DEBUG Calling 'git fetch origin pull/709/head'
2024-04-17 10:29:37,604 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-04-17 10:29:37,604 [ scc.git] DEBUG * branch refs/pull/709/head -> FETCH_HEAD
2024-04-17 10:29:37,613 [ scc.git] DEBUG ## Unique users: []
2024-04-17 10:29:37,613 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:37,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:37,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-04-17 10:29:37,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:37,627 [ 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 10:29:37,635 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:37,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:37,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...197c2a2fc5fb1da081e4d60a70e0fe36164c08dc'
2024-04-17 10:29:37,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:37,798 [ 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 10:29:37,806 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:38,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:38,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...90e636a2e6ec13d78e3bd0788a484722606ff28e'
2024-04-17 10:29:38,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:38,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 708 (Community meeting) 90e636a2e6ec13d78e3bd0788a484722606ff28e'
2024-04-17 10:29:38,211 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:38,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:38,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 10:29:38,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:38,617 [ 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 10:29:38,632 [ scc.git] DEBUG Auto-merging build.sh
2024-04-17 10:29:38,632 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.sh
2024-04-17 10:29:38,632 [ scc.git] DEBUG Auto-merging index.html
2024-04-17 10:29:38,632 [ scc.git] DEBUG CONFLICT (content): Merge conflict in index.html
2024-04-17 10:29:38,632 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-17 10:29:38,633 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-17 10:29:38,643 [ scc.git] DEBUG Calling 'git reset --hard 7c84e3a1a6332d93b24b575fdec30dac3ab38155'
2024-04-17 10:29:38,649 [ scc.git] DEBUG HEAD is now at 7c84e3a merge master -Dorg -Snone
2024-04-17 10:29:39,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:39,010 [ scc.git] DEBUG Calling 'git merge-base 7c84e3a1a6332d93b24b575fdec30dac3ab38155 d6b6fdf27cb09a91568dac3453d0e7be26e08d92'
2024-04-17 10:29:39,017 [ scc.git] DEBUG Calling 'git diff --name-only 00985ace9a13df3ff6979f6c6c7589746abe1ad9..7c84e3a1a6332d93b24b575fdec30dac3ab38155'
2024-04-17 10:29:39,021 [ scc.git] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
Conflicting PR. Removed from build [WEBSITE-push#48](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/consoleText) for more details.
Possible conflicts:
- Upstream changes
- index.html
- build.sh
--conflicts
2024-04-17 10:29:39,024 [ scc.config] DEBUG Found github.token
2024-04-17 10:29:39,024 [ scc.git] DEBUG Adding comment to issue #709.
2024-04-17 10:29:39,792 [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 10:29:39,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 10:29:39,826 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:39,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:39,829 [ scc.repo] DEBUG ## PRs found:
2024-04-17 10:29:40,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None
2024-04-17 10:29:40,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/10 HTTP/1.1" 200 None
2024-04-17 10:29:40,789 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-17 10:29:41,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-04-17 10:29:41,815 [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 10:29:42,330 [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 10:29:42,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-04-17 10:29:43,219 [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 10:29:43,220 [ scc.repo] DEBUG - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-04-17 10:29:43,220 [ scc.repo] DEBUG ## Branches found:
2024-04-17 10:29:43,220 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 10:29:43,220 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:43,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:43,223 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 10:29:43,226 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 10:29:43,226 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 10:29:43,230 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 10:29:43,233 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:43,233 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-17 10:29:43,610 [ scc.git] DEBUG From https://github.com/ome/schemas
2024-04-17 10:29:43,610 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-17 10:29:43,613 [ scc.git] DEBUG ## Unique users: []
2024-04-17 10:29:43,613 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:43,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:43,616 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e1257555be50189441800592768cdfbb3e9dc48c'
2024-04-17 10:29:43,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:43,622 [ 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 10:29:43,630 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-17 10:29:43,632 [ scc.git] DEBUG pom.xml | 2 +-
2024-04-17 10:29:43,632 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-17 10:29:43,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:43,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 10:29:43,825 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:43,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:43,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:43,860 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 10:29:43,865 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f70924a2550> has no local changes
2024-04-17 10:29:43,865 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/)'
2024-04-17 10:29:43,872 [ scc.git] DEBUG [detached HEAD b6d9bf0] merge master -Dorg -Ssuccess-only
2024-04-17 10:29:43,872 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 10:29:43,872 [ scc.repo] DEBUG ## PRs found:
2024-04-17 10:29:44,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2
2024-04-17 10:29:44,214 [ scc.repo] DEBUG ## Branches found:
2024-04-17 10:29:44,214 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 10:29:44,214 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:44,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:44,217 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-17 10:29:44,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-17 10:29:44,220 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-17 10:29:44,224 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-17 10:29:44,227 [ scc.git] DEBUG Already up to date.
2024-04-17 10:29:44,227 [ scc.git] DEBUG ## Unique users: []
2024-04-17 10:29:44,227 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:44,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:44,230 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-17 10:29:44,263 [ scc.git] DEBUG Get sha1 of %s
2024-04-17 10:29:44,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-17 10:29:44,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:44,299 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 10:29:44,303 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f70924a2580> has no local changes
2024-04-17 10:29:44,303 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/)'
2024-04-17 10:29:44,310 [ scc.git] DEBUG [detached HEAD b3fa284] merge master -Dorg -Ssuccess-only
2024-04-17 10:29:44,310 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 10:29:44,310 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-17 10:29:44,346 [ scc.config] DEBUG Found submodule.Schemas.url
2024-04-17 10:29:44,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:44,633 [ scc.config] DEBUG Found submodule._minutes.url
2024-04-17 10:29:45,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-17 10:29:45,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-17 10:29:45,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f70935894c0> has local changes
2024-04-17 10:29:45,062 [ 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 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'
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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/48/)'
2024-04-17 10:29:45,070 [ scc.git] DEBUG [detached HEAD 116fb6a] merge master -Dorg -Ssuccess-only
2024-04-17 10:29:45,070 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-04-17 10:29:45,070 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 4 deletions(-)
2024-04-17 10:29:45,070 [ scc.merge] INFO Already up to date.
2024-04-17 10:29:45,070 [ scc.merge] INFO
2024-04-17 10:29:45,070 [ scc.merge] INFO Merged PRs:
2024-04-17 10:29:45,070 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-04-17 10:29:45,070 [ scc.merge] INFO - PR 706 dependabot[bot] 'Bump _minutes from `76e3b8e` to `4e536b4`'
2024-04-17 10:29:45,070 [ scc.merge] INFO - PR 708 pwalczysko 'Community meeting'
2024-04-17 10:29:45,070 [ scc.merge] INFO
2024-04-17 10:29:45,070 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-17 10:29:45,070 [ scc.merge] INFO - PR 709 pwalczysko 'Only rework main index page, just reformulate and add eventbrite'
2024-04-17 10:29:45,070 [ scc.merge] INFO
2024-04-17 10:29:45,070 [ scc.merge] INFO Repository: ome/schemas
2024-04-17 10:29:45,070 [ scc.merge] INFO Already up to date.
2024-04-17 10:29:45,070 [ scc.merge] INFO
2024-04-17 10:29:45,070 [ scc.merge] INFO Merged PRs:
2024-04-17 10:29:45,070 [ scc.merge] INFO - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-04-17 10:29:45,070 [ scc.merge] INFO
2024-04-17 10:29:45,070 [ scc.merge] INFO Repository: ome/meeting-minutes
2024-04-17 10:29:45,070 [ scc.merge] INFO Already up to date.
2024-04-17 10:29:45,071 [ scc.merge] INFO
2024-04-17 10:29:45,071 [ scc.merge] INFO
2024-04-17 10:29:45,071 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-17 10:29:45,071 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 10:29:45,074 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-04-17 10:29:45,074 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 10:29:45,077 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-04-17 10:29:45,077 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-04-17 10:29:45,077 [ scc.git] DEBUG Calling 'git remote'
2024-04-17 10:29:45,080 [ 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 10:29:59,901 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/www.openmicroscopy.org/tree/merge_ci