Skip to content

Commit 40732e3

Browse files
authored
update(GHA): bump action versions and simplify lint (#197)
* update(GHA): bump action versions and simplify lint - only run if changes found on charts - uplift action version to use new one - remove download chart from GIE and GW - move lychee to use action and config move to .github Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: markdown lint Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com>
1 parent 5017eda commit 40732e3

File tree

9 files changed

+47
-59
lines changed

9 files changed

+47
-59
lines changed

.github/lychee.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Lychee link checker configuration
2+
# https://lychee.cli.rs/
3+
4+
# Accept non-200 status codes (429: rate limits)
5+
accept = ["200", "429"]
6+
7+
# Timeout per request (seconds)
8+
timeout = 20
9+
10+
# Retry failed requests
11+
max_retries = 3

.github/workflows/lint-charts.yaml

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,30 @@ name: Lint and Test Charts
33
on: pull_request
44

55
jobs:
6+
detect-changes:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
changed: ${{ steps.check.outputs.changed }}
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v6
13+
with:
14+
fetch-depth: 0
15+
16+
- name: Check for chart changes
17+
id: check
18+
run: |
19+
if git diff --name-only origin/${{ github.event.repository.default_branch }}...HEAD | grep -q '^charts/'; then
20+
echo "changed=true" >> "$GITHUB_OUTPUT"
21+
fi
22+
623
lint-test:
24+
needs: detect-changes
25+
if: needs.detect-changes.outputs.changed == 'true'
726
runs-on: ubuntu-latest
827
steps:
928
- name: Checkout
10-
uses: actions/checkout@v3
29+
uses: actions/checkout@v6
1130
with:
1231
fetch-depth: 0
1332

@@ -16,30 +35,16 @@ jobs:
1635
with:
1736
version: v3.17.0
1837

19-
- uses: actions/setup-python@v5.3.0
20-
with:
21-
python-version: '3.x'
22-
check-latest: true
23-
2438
- name: Set up chart-testing
25-
uses: helm/chart-testing-action@v2.7.0
26-
27-
- name: Run chart-testing (list-changed)
28-
id: list-changed
29-
run: |
30-
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
31-
if [[ -n "$changed" ]]; then
32-
echo "changed=true" >> "$GITHUB_OUTPUT"
33-
fi
39+
uses: helm/chart-testing-action@v2.8.0
3440

3541
- name: Add Helm dependency repos
3642
run: |
3743
for dir in $(ls -d charts/*/); do
3844
helm dependency list --max-col-width 120 $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "helm repo add " $1 " " $3 }' | while read cmd; do $cmd; done
3945
done
4046
41-
- name: Run make lint for chart-testing
42-
if: steps.list-changed.outputs.changed == 'true'
47+
- name: Run make lint
4348
env:
4449
TARGET_BRANCH: ${{ github.event.repository.default_branch }}
4550
run: make lint
@@ -48,19 +53,7 @@ jobs:
4853
run: make verify
4954

5055
- name: Create kind cluster
51-
if: steps.list-changed.outputs.changed == 'true'
5256
uses: helm/kind-action@v1.12.0
5357

54-
- name: Install CRDs
55-
if: steps.list-changed.outputs.changed == 'true'
56-
run: |
57-
# Install Kubernetes Gateway API CRDs
58-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.3.0/standard-install.yaml
59-
60-
# Install Kubernetes Gateway API Inference Extension CRDs
61-
VERSION=v0.3.0
62-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api-inference-extension/releases/download/$VERSION/manifests.yaml
63-
6458
- name: Run chart-testing (install)
65-
if: steps.list-changed.outputs.changed == 'true'
6659
run: ct install --target-branch ${{ github.event.repository.default_branch }} --helm-extra-set-args "--set=accelerator.type=cpu"

.github/workflows/md-link-check.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

19-
- name: Install lychee v0.18.1
20-
run: |
21-
curl -Ls https://github.com/lycheeverse/lychee/releases/download/lychee-v0.20.1/lychee-x86_64-unknown-linux-gnu.tar.gz | tar xz
22-
sudo mv lychee /usr/local/bin
23-
24-
- name: Run lychee on Markdown files with config
25-
run: |
26-
find . -name "*.md" -print0 | xargs -0 lychee --config .lychee.toml --verbose --no-progress
19+
- name: Run markdown link checker
20+
uses: lycheeverse/lychee-action@v2.7.0
21+
with:
22+
args: --verbose --no-progress --include-fragments --format markdown --config .github/lychee.toml '**/*.md'
23+
fail: true

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515

.github/workflows/re-run-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
rerun_pr_tests:
99
name: rerun_pr_tests
1010
if: ${{ github.event.issue.pull_request }}
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: estroz/rerun-actions@main
1414
with:

.lychee.toml

Lines changed: 0 additions & 13 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We welcome contributions to the llm-d-modelservice chart! If you have a bug fix,
2323

2424
Before submitting a pull request, please make sure you have the following tools installed:
2525

26-
- [Helm](http://helm.sh/)
26+
- [Helm](https://helm.sh/)
2727
- [Chart Testing](https://github.com/helm/chart-testing)
2828
- [pre-commit](https://pre-commit.com/)
2929
<!-- TODO: Once supported, also install:
@@ -80,7 +80,7 @@ make pre-commit-run
8080
For every Pull Request submitted, ensure the following steps have been done:
8181

8282
1. [Sign your commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
83-
2. [Sign-off your commits](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt-code--signoffcode)
83+
2. [Sign-off your commits](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff)
8484
3. Ensure that the `make lint`, `make verify` command runs successfully to validate your changes
8585
4. Update the version number in the [`charts/llm-d-modelservice/Chart.yaml`](charts/llm-d-modelservice/Chart.yaml) file using
8686
[semantic versioning](https://semver.org/). Follow the `X.Y.Z` format so the nature of the changes is reflected in the

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Note that the field `llm-d.ai/role` will be addition in addition to the labels s
4444

4545
### HTTPRoute
4646

47-
In addition to deploying the GAIE chart, an `HTTPRoute` is typically required to connect the `Gateway` to the `InferencePool`. Creating an HTTPRoute is not part of either chart. Some examples are provided [here](https://github.com/llm-d-incubation/llm-d-modelservice/blob/main/examples/README.md#httproute).
47+
In addition to deploying the GAIE chart, an `HTTPRoute` is typically required to connect the `Gateway` to the `InferencePool`. Creating an HTTPRoute is not part of either chart. Some examples are provided [here](examples/README.md#httproute-examples).
4848

4949
## Examples
5050

examples/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ helm repo update
1414
|---------|-------------|----------------------|
1515
| [`values-cpu.yaml`](#1-cpu-only) | CPU-only inference example | Single node, no GPU required |
1616
| [`values-pd.yaml`](#2-pd-disaggregation) | Prefill/decode disaggregation example | Multi-GPU, demonstrates P/D splitting |
17-
| [`values-xpu.yaml`](#5-intel-xpu-examples) | Intel XPU single-node example | Intel Data Center GPU Max |
18-
| [`pvc/`](#4-loading-a-model-from-a-pvc) | Persistent volume examples | Shows different storage options |
17+
| [`values-xpu.yaml`](#4-intel-xpu-examples) | Intel XPU single-node example | Intel Data Center GPU Max |
18+
| [`pvc/`](#3-loading-a-model-from-a-pvc) | Persistent volume examples | Shows different storage options |
1919
| [`dra/`](#6-dynamic-resource-allocation) | Dynamic Resource Allocation (DRA) examples | Shows different DRA use cases |
2020

21-
All the examples assume a `Gateway` and GAIE configuration have been deployed. See the [llm-d guides](https://github.com/llm-d/llm-d/tree/main/guides) for examples. Further, an `HTTPRoute` must be deployed. Some examples of `HTTPRoute` is provided [below](https://github.com/llm-d-incubation/llm-d-modelservice/blob/main/examples/README.md#httproute).
21+
All the examples assume a `Gateway` and GAIE configuration have been deployed. See the [llm-d guides](https://github.com/llm-d/llm-d/tree/main/guides) for examples. Further, an `HTTPRoute` must be deployed. Some examples of `HTTPRoute` is provided [below](#httproute-examples).
2222

2323
## Usage Examples
2424

0 commit comments

Comments
 (0)