Skip to content

Commit 3d6c6ea

Browse files
sd109sd109
authored
Merge pull request #57 from stackhpc/fix/workflow-ordering
Improve workflow ordering
2 parents e676a70 + 3fe3d4f commit 3d6c6ea

File tree

5 files changed

+128
-96
lines changed

5 files changed

+128
-96
lines changed

‎.github/workflows/build-push-artifacts.yml‎

Lines changed: 11 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -8,95 +8,16 @@ on:
88
- master
99
tags:
1010
- "*"
11-
# Also allow publication to be done via a workflow call
12-
# In this case, the chart version is returned as an output
13-
workflow_call:
14-
inputs:
15-
ref:
16-
type: string
17-
description: The ref to build.
18-
required: true
19-
outputs:
20-
chart-version:
21-
description: The chart version that was published
22-
value: ${{ jobs.build_push_chart.outputs.chart-version }}
2311

2412
jobs:
25-
build_push_images:
26-
name: Build and push images
27-
runs-on: ubuntu-latest
28-
strategy:
29-
matrix:
30-
include:
31-
- component: chat
32-
- component: image-analysis
33-
permissions:
34-
contents: read
35-
id-token: write # needed for signing the images with GitHub OIDC Token
36-
packages: write # required for pushing container images
37-
security-events: write # required for pushing SARIF files
38-
steps:
39-
- name: Check out the repository
40-
uses: actions/checkout@v4
41-
with:
42-
ref: ${{ inputs.ref || github.ref }}
43-
44-
- name: Login to GitHub Container Registry
45-
uses: docker/login-action@v3
46-
with:
47-
registry: ghcr.io
48-
username: ${{ github.actor }}
49-
password: ${{ secrets.GITHUB_TOKEN }}
50-
51-
- name: Get SemVer version for current commit
52-
id: semver
53-
uses: azimuth-cloud/github-actions/semver@master
54-
55-
- name: Calculate metadata for image
56-
id: image-meta
57-
uses: docker/metadata-action@v5
58-
with:
59-
images: ghcr.io/stackhpc/azimuth-llm-${{ matrix.component }}-ui
60-
# Produce the branch name or tag and the SHA as tags
61-
tags: |
62-
type=ref,event=branch
63-
type=ref,event=tag
64-
type=raw,value=${{ steps.semver.outputs.short-sha }}
65-
66-
- name: Build and push image
67-
uses: azimuth-cloud/github-actions/docker-multiarch-build-push@master
68-
with:
69-
cache-key: ${{ matrix.component }}
70-
context: ./web-apps/
71-
file: ./web-apps/${{ matrix.component }}/Dockerfile
72-
platforms: linux/amd64,linux/arm64
73-
push: true
74-
tags: ${{ steps.image-meta.outputs.tags }}
75-
labels: ${{ steps.image-meta.outputs.labels }}
76-
77-
build_push_chart:
78-
name: Build and push Helm chart
79-
runs-on: ubuntu-latest
80-
# Only build and push the chart if the images built successfully
81-
needs: [build_push_images]
82-
outputs:
83-
chart-version: ${{ steps.semver.outputs.version }}
84-
steps:
85-
- name: Check out the repository
86-
uses: actions/checkout@v4
87-
with:
88-
ref: ${{ inputs.ref || github.ref }}
89-
# This is important for the semver action to work correctly
90-
# when determining the number of commits since the last tag
91-
fetch-depth: 0
92-
93-
- name: Get SemVer version for current commit
94-
id: semver
95-
uses: azimuth-cloud/github-actions/semver@master
96-
97-
- name: Publish Helm charts
98-
uses: azimuth-cloud/github-actions/helm-publish@master
99-
with:
100-
token: ${{ secrets.GITHUB_TOKEN }}
101-
version: ${{ steps.semver.outputs.version }}
102-
app-version: ${{ steps.semver.outputs.short-sha }}
13+
publish_images:
14+
uses: ./.github/workflows/build-push-images.yml
15+
with:
16+
ref: ${{ github.ref }}
17+
secrets: inherit
18+
19+
publish_charts:
20+
uses: ./.github/workflows/build-push-charts.yml
21+
with:
22+
ref: ${{ github.ref }}
23+
secrets: inherit

‎.github/workflows/build-push-charts.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Adapted from https://github.com/stackhpc/azimuth/blob/master/.github/workflows/build-push-artifacts.yaml
2+
name: Publish Helm charts
3+
4+
on:
5+
workflow_call:
6+
inputs:
7+
ref:
8+
type: string
9+
description: The ref to build.
10+
required: true
11+
outputs:
12+
chart-version:
13+
description: The chart version that was published
14+
value: ${{ jobs.build_push_chart.outputs.chart-version }}
15+
16+
jobs:
17+
build_push_charts:
18+
name: Build and push Helm charts
19+
runs-on: ubuntu-latest
20+
# Only build and push the chart if the images built successfully
21+
outputs:
22+
chart-version: ${{ steps.semver.outputs.version }}
23+
steps:
24+
- name: Check out the repository
25+
uses: actions/checkout@v4
26+
with:
27+
ref: ${{ inputs.ref }}
28+
# This is important for the semver action to work correctly
29+
# when determining the number of commits since the last tag
30+
fetch-depth: 0
31+
32+
- name: Get SemVer version for current commit
33+
id: semver
34+
uses: azimuth-cloud/github-actions/semver@master
35+
36+
- name: Publish Helm charts
37+
uses: azimuth-cloud/github-actions/helm-publish@master
38+
with:
39+
token: ${{ secrets.GITHUB_TOKEN }}
40+
version: ${{ steps.semver.outputs.version }}
41+
app-version: ${{ steps.semver.outputs.short-sha }}

‎.github/workflows/build-push-images.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Adapted from https://github.com/stackhpc/azimuth/blob/master/.github/workflows/build-push-artifacts.yaml
2+
name: Publish container images
3+
4+
on:
5+
workflow_call:
6+
inputs:
7+
ref:
8+
type: string
9+
description: The ref to build.
10+
required: true
11+
12+
jobs:
13+
build_push_images:
14+
name: Build and push images
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
include:
19+
- component: chat
20+
- component: image-analysis
21+
permissions:
22+
contents: read
23+
id-token: write # needed for signing the images with GitHub OIDC Token
24+
packages: write # required for pushing container images
25+
security-events: write # required for pushing SARIF files
26+
steps:
27+
- name: Check out the repository
28+
uses: actions/checkout@v4
29+
with:
30+
ref: ${{ inputs.ref }}
31+
32+
- name: Login to GitHub Container Registry
33+
uses: docker/login-action@v3
34+
with:
35+
registry: ghcr.io
36+
username: ${{ github.actor }}
37+
password: ${{ secrets.GITHUB_TOKEN }}
38+
39+
- name: Get SemVer version for current commit
40+
id: semver
41+
uses: azimuth-cloud/github-actions/semver@master
42+
43+
- name: Calculate metadata for image
44+
id: image-meta
45+
uses: docker/metadata-action@v5
46+
with:
47+
images: ghcr.io/stackhpc/azimuth-llm-${{ matrix.component }}-ui
48+
# Produce the branch name or tag and the SHA as tags
49+
tags: |
50+
type=ref,event=branch
51+
type=ref,event=tag
52+
type=raw,value=${{ steps.semver.outputs.short-sha }}
53+
54+
- name: Build and push image
55+
uses: azimuth-cloud/github-actions/docker-multiarch-build-push@master
56+
with:
57+
cache-key: ${{ matrix.component }}
58+
context: ./web-apps/
59+
file: ./web-apps/${{ matrix.component }}/Dockerfile
60+
platforms: linux/amd64,linux/arm64
61+
push: true
62+
tags: ${{ steps.image-meta.outputs.tags }}
63+
labels: ${{ steps.image-meta.outputs.labels }}

‎.github/workflows/test-pr.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,18 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: PR must be from a branch in the stackhpc/azimuth-llm repo
27-
run: exit ${{ github.event.pull_request.head.repo.full_name == 'stackhpc/azimuth-llm' && '0' || '1' }}
27+
run: |
28+
exit ${{ github.event.pull_request.head.repo.full_name == 'stackhpc/azimuth-llm' && '0' || '1' }}
2829
29-
publish_artifacts:
30+
publish_images:
3031
needs: [fail_on_remote]
31-
uses: ./.github/workflows/build-push-artifacts.yml
32+
uses: ./.github/workflows/build-push-images.yml
3233
with:
3334
ref: ${{ github.event.pull_request.head.sha }}
3435
secrets: inherit
3536

3637
chart_validation:
37-
needs: [publish_artifacts]
38+
needs: [publish_images]
3839
runs-on: ubuntu-latest
3940
env:
4041
CLUSTER_NAME: chart-testing
@@ -74,3 +75,9 @@ jobs:
7475
- name: Run chart install and test
7576
run: ct install --config ct.yaml
7677

78+
publish_charts:
79+
needs: [chart_validation]
80+
uses: ./.github/workflows/build-push-charts.yml
81+
with:
82+
ref: ${{ github.event.pull_request.head.sha }}
83+
secrets: inherit

‎.github/workflows/update-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Check for dependency updates
22
on:
33
schedule:
4-
- cron: "0 9 * * *"
4+
- cron: "0 9 * * 0"
55
workflow_dispatch:
66
jobs:
77
check_for_update:
@@ -33,7 +33,7 @@ jobs:
3333
git config user.name "${{ github.actor }}"
3434
3535
# Get latest vLLM release tag and replace it in various places
36-
CHART_VALUES=chart/values.yaml
36+
CHART_VALUES=charts/azimuth-llm/values.yaml
3737
# Export vars so that they can be used by yq's strenv function
3838
export OLD_VLLM_TAG=$(yq '.api.image.version' $CHART_VALUES)
3939
export NEW_VLLM_TAG=$(curl -s https://api.github.com/repos/vllm-project/vllm/releases/latest | jq .tag_name | sed s/\"//g)

0 commit comments

Comments
 (0)