Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion .github/workflows/vermeer-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ on:
push:
branches:
- master
- /^release-.*$/
- 'release-*'
paths:
- vermeer/**
- computer/pom.xml
- .github/workflows/vermeer-ci.yml
pull_request:
paths:
- vermeer/**
- computer/pom.xml
- .github/workflows/vermeer-ci.yml

defaults:
Expand All @@ -44,6 +46,21 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Check release versions
run: |
python3 - <<'PY'
import re
import xml.etree.ElementTree as ET

root = ET.parse('../computer/pom.xml').getroot()
revision = root.findtext('{*}properties/{*}revision')
source = open('apps/version/version.go', encoding='utf-8').read()
match = re.search(r'^const Version = "([^"]+)"$', source, re.MULTILINE)
if not revision or not match or revision != match.group(1):
raise SystemExit(f'Computer revision {revision!r} and Vermeer version '
f'{match.group(1) if match else None!r} must match')
PY

- name: Set up Go
uses: actions/setup-go@v5
with:
Expand Down
4 changes: 4 additions & 0 deletions vermeer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ cd vermeer

The `--env` parameter specifies the configuration file name in the `config/` folder (e.g., `master.ini`, `worker.ini`).

Master and Worker must run the same Vermeer version: registration rejects a
version mismatch. When upgrading, rebuild and update all Master and Worker
images together, and expect Workers to be unavailable during the transition.

#### Using the Shell Script

Configure parameters in `vermeer.sh`, then:
Expand Down
2 changes: 1 addition & 1 deletion vermeer/apps/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ under the License.

package version

const Version = "1.7.0"
const Version = "1.8.0"
Loading