Skip to content

Commit 814db62

Browse files
committed
Use task targets consitently for validation
Signed-off-by: Radoslav Dimitrov <[email protected]>
1 parent 41d4aaf commit 814db62

File tree

2 files changed

+12
-49
lines changed

2 files changed

+12
-49
lines changed

.github/workflows/build-and-publish.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ jobs:
6363
name: codecov-umbrella
6464
continue-on-error: true
6565

66-
- name: Build tools
66+
- name: Install Task
67+
uses: arduino/setup-task@v2
68+
69+
- name: Validate schema file syntax
6770
run: |
68-
go build -o registry-builder ./cmd/registry-builder
69-
go build -o import-from-toolhive ./cmd/import-from-toolhive
71+
echo "Validating schema JSON syntax..."
72+
jq empty schemas/registry.schema.json
73+
echo "✅ Schema file is valid JSON"
7074
7175
- name: Validate registry entries
72-
run: ./registry-builder validate -v
76+
run: task validate
7377

7478
build-and-release:
7579
name: Build and Release Registry
@@ -88,13 +92,13 @@ jobs:
8892
go-version-file: 'go.mod'
8993
cache: true
9094

91-
- name: Build registry-builder
92-
run: go build -o registry-builder ./cmd/registry-builder
95+
- name: Install Task
96+
uses: arduino/setup-task@v2
9397

9498
- name: Build registry files (both formats)
9599
run: |
96100
mkdir -p dist
97-
./registry-builder build --format all -v
101+
task build:registry
98102
cp build/registry.json dist/registry.json
99103
cp build/official-registry.json dist/official-registry.json
100104
CONTAINER_COUNT=$(jq '.servers | length' dist/registry.json)

scripts/sync-schema-version.sh

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ update_schema_reference() {
105105

106106
log "Updating schema reference from $old_sha to $new_sha"
107107

108-
# Create backup
109-
cp "$SCHEMA_FILE" "$SCHEMA_FILE.backup"
110108

111109
local timestamp
112110
timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -137,32 +135,6 @@ update_schema_reference() {
137135
success "Schema reference updated to commit $new_sha"
138136
}
139137

140-
# Function to validate the updated schema
141-
validate_schema() {
142-
log "Validating updated schema..."
143-
144-
cd "$PROJECT_ROOT"
145-
146-
# First check if the schema is valid JSON
147-
if ! jq empty "$SCHEMA_FILE" 2>/dev/null; then
148-
error "Schema file is not valid JSON!"
149-
return 1
150-
fi
151-
152-
# Run the registry validation
153-
if command -v task >/dev/null 2>&1; then
154-
if task validate >/dev/null 2>&1; then
155-
success "Schema validation passed!"
156-
return 0
157-
else
158-
error "Schema validation failed!"
159-
return 1
160-
fi
161-
else
162-
warn "Task not available, skipping registry validation"
163-
return 0
164-
fi
165-
}
166138

167139
# Function to show what changed
168140
show_changes() {
@@ -231,22 +203,9 @@ main() {
231203
exit 1
232204
fi
233205

234-
# Validate the changes
235-
if ! validate_schema; then
236-
error "Validation failed after update. Restoring backup..."
237-
if [[ -f "$SCHEMA_FILE.backup" ]]; then
238-
mv "$SCHEMA_FILE.backup" "$SCHEMA_FILE"
239-
warn "Schema restored from backup"
240-
fi
241-
exit 1
242-
fi
243-
244-
# Show what changed
206+
# Show what changed
245207
show_changes "$current_sha" "$schema_sha"
246208

247-
# Clean up backup
248-
rm -f "$SCHEMA_FILE.backup"
249-
250209
success "Schema sync completed successfully!"
251210
log ""
252211
log "Next steps:"

0 commit comments

Comments
 (0)