Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
"buildmark"
]
},
"demaconsulting.versionmark": {
"version": "1.2.0",
"commands": [
"versionmark"
]
},
"demaconsulting.reviewmark": {
"version": "1.0.0",
"commands": [
Expand Down
27 changes: 3 additions & 24 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
# === INSTALL DEPENDENCIES ===
# This section installs all required dependencies for quality checks.
# Downstream projects: Add any additional dependency installations here.
# Note: VersionMark version capture is not available here because this job
# builds VersionMark itself - capture is performed in integration-test and
# build-docs jobs after the tool is built and installed.

- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -87,9 +84,6 @@ jobs:

# === BUILD AND TEST ===
# This section builds and tests the project.
# Note: VersionMark version capture is not available here because this job
# builds VersionMark itself - capture is performed in integration-test and
# build-docs jobs after the tool is built and installed.
# Downstream projects: Add any additional build and test steps here.

- name: Restore Dependencies
Expand Down Expand Up @@ -364,12 +358,6 @@ jobs:
merge-multiple: true
continue-on-error: true

- name: Download packages artifact
uses: actions/download-artifact@v8
with:
name: packages-ubuntu-latest
path: packages

# === INSTALL DEPENDENCIES ===
# This section installs all required dependencies and tools for document generation.
# Downstream projects: Add any additional dependency installations here.
Expand All @@ -387,15 +375,6 @@ jobs:
- name: Install npm dependencies
run: npm install

- name: Install VersionMark from package
shell: bash
run: |
echo "Installing VersionMark version ${{ inputs.version }}"
dotnet tool install --global \
--add-source packages \
--version ${{ inputs.version }} \
DemaConsulting.VersionMark

- name: Restore Tools
run: dotnet tool restore

Expand All @@ -408,7 +387,7 @@ jobs:
run: |
mkdir -p artifacts
echo "Capturing tool versions..."
versionmark --capture --job-id "build-docs" \
dotnet versionmark --capture --job-id "build-docs" \
--output "artifacts/versionmark-build-docs.json" -- \
dotnet git node npm pandoc weasyprint sarifmark sonarmark reqstream buildmark reviewmark
echo "✓ Tool versions captured"
Expand All @@ -424,7 +403,7 @@ jobs:
run: dotnet buildmark --validate --results artifacts/buildmark-self-validation.trx

- name: Run VersionMark self-validation
run: versionmark --validate --results artifacts/versionmark-self-validation.trx
run: dotnet versionmark --validate --results artifacts/versionmark-self-validation.trx

- name: Run SarifMark self-validation
run: dotnet sarifmark --validate --results artifacts/sarifmark-self-validation.trx
Expand Down Expand Up @@ -523,7 +502,7 @@ jobs:
shell: bash
run: |
echo "Publishing tool versions..."
versionmark --publish --report docs/build_notes/versions.md --report-depth 1 \
dotnet versionmark --publish --report docs/build_notes/versions.md --report-depth 1 \
-- "artifacts/**/versionmark-*.json"
echo "✓ Tool versions published"

Expand Down
4 changes: 4 additions & 0 deletions lint.bat
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ REM Run reqstream lint
dotnet reqstream --lint --requirements requirements.yaml
if errorlevel 1 set "LINT_ERROR=1"

REM Run versionmark lint
dotnet versionmark --lint
if errorlevel 1 set "LINT_ERROR=1"

REM Run reviewmark lint
dotnet reviewmark --lint
if errorlevel 1 set "LINT_ERROR=1"
Expand Down
5 changes: 5 additions & 0 deletions lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ if [ "$skip_dotnet_tools" != "1" ]; then
dotnet reqstream --lint --requirements requirements.yaml || lint_error=1
fi

# Run versionmark lint
if [ "$skip_dotnet_tools" != "1" ]; then
dotnet versionmark --lint || lint_error=1
fi

# Run reviewmark lint
if [ "$skip_dotnet_tools" != "1" ]; then
dotnet reviewmark --lint || lint_error=1
Expand Down
Loading