Skip to content

Commit 2bc23f8

Browse files
authored
fix: github action missing Trivy scan on sidecar image (#481)
- Trivy scan should be done on both images - No need install python3-dev in Github Action due to ubuntu-latest already has it pre-installed - move "make build" before "make test" to have quick exit - use "make" target to install k-v cache dependency - use Github Action than download lychee binary Signed-off-by: Wen Zhou <wenzhou@redhat.com>
1 parent 70838d5 commit 2bc23f8

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

.github/workflows/ci-pr-checks.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ jobs:
2727
go-version: "${{ env.GO_VERSION }}"
2828
cache-dependency-path: ./go.sum
2929

30-
- name: Install kvcache dependencies
31-
run: |
32-
sudo apt-get update
33-
sudo apt-get install -y libzmq3-dev pkg-config python3-dev
30+
- name: Install dependencies
31+
run: sudo make install-dependencies
3432

3533
- name: Configure CGO for Python
3634
run: |
@@ -58,12 +56,12 @@ jobs:
5856
CPATH: ${{ env.CPATH }}
5957
PKG_CONFIG_PATH: ${{ env.PKG_CONFIG_PATH }}
6058

61-
- name: Run make test
62-
shell: bash
63-
run: |
64-
make test
65-
6659
- name: Run make build
6760
shell: bash
6861
run: |
6962
make build
63+
64+
- name: Run make test
65+
shell: bash
66+
run: |
67+
make test

.github/workflows/ci-release.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ jobs:
1414
- name: Checkout source
1515
uses: actions/checkout@v6
1616

17-
- name: Set project name from repository
17+
- name: Set image names
1818
id: version
1919
run: |
2020
repo="${GITHUB_REPOSITORY##*/}"
2121
echo "project_name=$repo" >> "$GITHUB_OUTPUT"
22+
echo "sidecar_name=llm-d-routing-sidecar" >> "$GITHUB_OUTPUT"
2223
2324
- name: Print project name
2425
run: echo "Project is ${{ steps.version.outputs.project_name }}"
@@ -52,12 +53,17 @@ jobs:
5253
with:
5354
docker-file: Dockerfile.sidecar
5455
tag: ${{ steps.tag.outputs.tag }}
55-
image-name: llm-d-routing-sidecar
56+
image-name: ${{ steps.version.outputs.sidecar_name }}
5657
registry: ghcr.io/llm-d
5758
github-token: ${{ secrets.GHCR_TOKEN }}
5859
prerelease: ${{ steps.tag.outputs.prerelease }}
5960

60-
- name: Run Trivy scan
61+
- name: Run Trivy scan on EPP image
6162
uses: ./.github/actions/trivy-scan
6263
with:
6364
image: ghcr.io/llm-d/${{ steps.version.outputs.project_name }}:${{ steps.tag.outputs.tag }}
65+
66+
- name: Run Trivy scan on sidecar image
67+
uses: ./.github/actions/trivy-scan
68+
with:
69+
image: ghcr.io/llm-d/${{ steps.version.outputs.sidecar_name }}:${{ steps.tag.outputs.tag }}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ jobs:
1616
- name: Checkout code
1717
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.18.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 lychee link checker
20+
uses: lycheeverse/lychee-action@v2.7.0
21+
with:
22+
args: '--config .lychee.toml --verbose --no-progress **/*.md'
23+
fail: true

.github/workflows/stale.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
days-before-close: -1
2020
stale-issue-label: 'lifecycle/stale'
2121
exempt-issue-labels: 'lifecycle/rotten'
22-
stale-issue-message: 'This issue is marked as stale after 90d of inactivity. After an additional 30d of inactivity, it will be closed. To prevent this issue from being closed, add a comment or remove the `lifecycle/stale` label.'
22+
stale-issue-message: 'This issue is marked as stale after 90d of inactivity. After an additional 30d of inactivity (15d to become rotten, then 15d more), it will be closed. To prevent this issue from being closed, add a comment or remove the `lifecycle/stale` label.'
2323
stale-pr-label: 'lifecycle/stale'
2424
exempt-pr-labels: 'lifecycle/rotten'
25-
stale-pr-message: 'This PR is marked as stale after 21d of inactivity. After an additional 14d of inactivity, it will be closed. To prevent this PR from being closed, add a comment or remove the `lifecycle/stale` label.'
25+
stale-pr-message: 'This PR is marked as stale after 21d of inactivity. After an additional 14d of inactivity (7d to become rotten, then 7d more), it will be closed. To prevent this PR from being closed, add a comment or remove the `lifecycle/stale` label.'
2626

2727
- name: 'Mark items rotten'
2828
uses: actions/stale@v10

0 commit comments

Comments
 (0)