Skip to content

Commit e6e8772

Browse files
committed
only need build for one OS
1 parent 0f970e5 commit e6e8772

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.github/workflows/build-deb.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os:
15-
- ubuntu-22.04
16-
- ubuntu-24.04
1714
varnish:
1815
- varnish77
1916
- varnish80
20-
runs-on: ${{ matrix.os }}
17+
runs-on: ubuntu-24.04
2118
steps:
2219
- uses: actions/checkout@v4
2320

@@ -27,7 +24,7 @@ jobs:
2724
- name: Cache Rust dependencies
2825
uses: Swatinem/rust-cache@v2
2926
with:
30-
shared-key: ${{ matrix.os }}-${{ matrix.varnish }}
27+
shared-key: ${{ matrix.varnish }}
3128

3229
- name: Install Varnish from packagecloud
3330
run: |
@@ -41,9 +38,9 @@ jobs:
4138
- name: Set Varnish version dependency
4239
run: |
4340
if [ "${{ matrix.varnish }}" = "varnish77" ]; then
44-
echo "VARNISH_DEB_DEPENDS=varnish (>= 7.7.0)" >> $GITHUB_ENV
41+
echo "VARNISH_DEB_DEPENDS=varnish (>= 7.7.0), varnish (<< 8.0.0)" >> $GITHUB_ENV
4542
elif [ "${{ matrix.varnish }}" = "varnish80" ]; then
46-
echo "VARNISH_DEB_DEPENDS=varnish (>= 8.0.0)" >> $GITHUB_ENV
43+
echo "VARNISH_DEB_DEPENDS=varnish (>= 8.0.0), varnish (<< 8.1.0)" >> $GITHUB_ENV
4744
else
4845
echo "Error: Unknown varnish version ${{ matrix.varnish }}"
4946
exit 1
@@ -60,5 +57,5 @@ jobs:
6057
- name: Upload artifact
6158
uses: actions/upload-artifact@v4
6259
with:
63-
name: vmod-lambda-${{ matrix.os }}-${{ matrix.varnish }}.deb
60+
name: vmod-lambda-${{ matrix.varnish }}.deb
6461
path: target/debian/*.deb

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Cache Rust dependencies
2323
uses: Swatinem/rust-cache@v2
2424
with:
25-
shared-key: ${{ matrix.os }}-${{ matrix.varnish }}
25+
shared-key: ${{ matrix.varnish }}
2626

2727
- name: Install Varnish from packagecloud
2828
run: |

0 commit comments

Comments
 (0)