Skip to content

Commit 481325f

Browse files
committed
Upgrade to mvx 0.11.0 and use it
1 parent 62e62de commit 481325f

File tree

4 files changed

+14
-31
lines changed

4 files changed

+14
-31
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
- name: Run go vet
2828
run: ./mvx go vet ./...
2929

30+
- name: Install golangci-lint
31+
run: ./mvx install-golangci-lint
32+
3033
- name: Check formatting
3134
run: |
3235
GOROOT=$(./mvx go env GOROOT)
33-
if [ "$($GOROOT/bin/gofmt -s -l . | wc -l)" -gt 0 ]; then
36+
unformatted=$($GOROOT/bin/gofmt -s -l .)
37+
if [ -n "$unformatted" ]; then
3438
echo "The following files are not formatted:"
35-
$GOROOT/bin/gofmt -s -l .
39+
echo "$unformatted"
3640
exit 1
3741
fi
3842
@@ -53,24 +57,7 @@ jobs:
5357
# Test that wrapper works with current version
5458
./mvx version
5559
56-
- name: Check for website changes
57-
uses: dorny/paths-filter@v3
58-
id: website-changes
59-
with:
60-
filters: |
61-
website:
62-
- 'website/**'
63-
64-
- name: Set up JDK 21 for website
65-
if: steps.website-changes.outputs.website == 'true'
66-
uses: actions/setup-java@v4
67-
with:
68-
java-version: '21'
69-
distribution: 'temurin'
70-
cache: maven
71-
7260
- name: Check website build
73-
if: steps.website-changes.outputs.website == 'true'
7461
run: |
7562
OWNER=$(echo "$GITHUB_REPOSITORY" | cut -d '/' -f 1)
7663
REPO=$(echo "$GITHUB_REPOSITORY" | cut -d '/' -f 2)
@@ -80,8 +67,7 @@ jobs:
8067
echo "SITE_PATH=$SITE_PATH" >> $GITHUB_ENV
8168
echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY SITE_DIR=$SITE_DIR SITE_URL=$SITE_URL SITE_PATH=$SITE_PATH"
8269
# Build website to catch template syntax errors
83-
cd website
84-
QUARKUS_ROQ_GENERATOR_BATCH=true mvn clean package quarkus:run -DskipTests --no-transfer-progress \
70+
QUARKUS_ROQ_GENERATOR_BATCH=true ./mvx mvn clean package quarkus:run -f website -DskipTests --no-transfer-progress \
8571
-Dquarkus.http.root-path=$SITE_PATH \
8672
-Dsite.url=$SITE_URL
8773

.github/workflows/deploy-website.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ jobs:
2222
with:
2323
fetch-depth: 0 # Fetch all history for proper git info
2424

25-
- name: Set up JDK 21
26-
uses: actions/setup-java@v4
27-
with:
28-
java-version: '21'
29-
distribution: 'temurin'
30-
cache: maven
31-
3225
- name: Build website
3326
shell: bash
3427
run: |
@@ -40,8 +33,7 @@ jobs:
4033
echo "SITE_URL=$SITE_URL" >> $GITHUB_ENV
4134
echo "SITE_PATH=$SITE_PATH" >> $GITHUB_ENV
4235
echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY SITE_DIR=$SITE_DIR SITE_URL=$SITE_URL SITE_PATH=$SITE_PATH"
43-
cd website
44-
QUARKUS_ROQ_GENERATOR_BATCH=true mvn clean package quarkus:run -DskipTests --no-transfer-progress \
36+
QUARKUS_ROQ_GENERATOR_BATCH=true ./mvx mvn clean package quarkus:run -f website -DskipTests --no-transfer-progress \
4537
-Dquarkus.http.root-path=$SITE_PATH \
4638
-Dsite.url=$SITE_URL
4739

.mvx/config.json5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
script: "go fmt ./..."
5353
},
5454

55+
"install-golangci-lint": {
56+
description: "Install golangci-lint linter",
57+
script: "go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0"
58+
},
59+
5560
lint: {
5661
description: "Run linter",
5762
script: "golangci-lint run"

.mvx/mvx.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The version of mvx to download and use
55
# Can be a specific version (e.g., "1.0.0") or "latest" for the most recent release
66
# For development, use "dev" when you have a local mvx-dev binary
7-
mvxVersion=0.8.0
7+
mvxVersion=0.11.0
88

99
# Alternative download URL (optional)
1010
# If not specified, defaults to GitHub releases

0 commit comments

Comments
 (0)