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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mise.lock linguist-generated
.mise/locks/** linguist-generated
CHANGELOG.md linguist-generated
**/src/main/generated/** linguist-generated
docs/apidiffs/** linguist-generated
Expand Down
5 changes: 5 additions & 0 deletions .github/renovate-tracked-deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@
"ubuntu"
]
},
".mise/locks/npm-renovate/44.82.0~026f02c4/package.json": {
"npm": [
"renovate"
]
},
".mvn/wrapper/maven-wrapper.properties": {
"maven-wrapper": [
"maven"
Expand Down
20 changes: 3 additions & 17 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
labels: [
'dependencies',
],
mise: {
'updatePinnedDependencies': false
},
packageRules: [
{
description: 'Update component-prefixed shared-workflow action tags',
Expand Down Expand Up @@ -55,23 +58,6 @@
groupName: 'java graalvm',
additionalBranchPrefix: 'graalvm-',
},
{
description: 'Compat tests pin an LTS JDK the upstream release supports; block major JDK bumps that would break those builds',
matchFileNames: [
'mise.toml',
],
matchDepNames: [
'java',
],
matchDepTypes: [
'task-jmx-exporter:compat-test-tools',
'task-micrometer:compat-test-tools',
],
matchUpdateTypes: [
'major',
],
enabled: false,
},
{
matchPackageNames: [
'io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha',
Expand Down
28 changes: 23 additions & 5 deletions .github/workflows/generate-protobuf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,33 @@ jobs:
run: |
git fetch origin main
DIFF_POM=$(git diff origin/main -- pom.xml)
DIFF_MISE=$(git diff origin/main -- mise.toml)
if ! echo "$DIFF_POM" | grep -q 'protobuf-java.version'; then
echo "::error::protobuf-java not updated in pom.xml"
exit 1
fi
if ! echo "$DIFF_MISE" | grep -q 'protoc'; then
echo "::error::protoc not updated in mise.toml"
exit 1
fi
python3 - <<'PY'
import subprocess
import tomllib

def protoc_version(text):
return tomllib.loads(text)["tools"]["protoc"][0]["version"]

base_lock = subprocess.run(
["git", "show", "origin/main:mise.lock"],
check=True,
capture_output=True,
text=True,
).stdout
with open("mise.lock", "rb") as lock_file:
current_lock = tomllib.load(lock_file)
base_version = protoc_version(base_lock)
current_version = current_lock["tools"]["protoc"][0]["version"]
if base_version == current_version:
raise SystemExit(
f"protoc version unchanged in mise.lock ({current_version})"
)
print(f"protoc updated: {base_version} -> {current_version}")
PY
- name: Generate protobuf sources
run: mise run generate
- name: Validate and export generated sources as a patch
Expand Down
Loading
Loading