Skip to content

Commit 3874a7b

Browse files
committed
ci: merge test workflows
1 parent ce5e994 commit 3874a7b

4 files changed

Lines changed: 20 additions & 84 deletions

File tree

.github/workflows/test-edge.yml

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

.github/workflows/test.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,19 @@ env:
2323
jobs:
2424
test:
2525
runs-on: ubuntu-latest
26+
continue-on-error: ${{ matrix.version == 'master' }}
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
version:
31+
- ''
32+
- master
2633
steps:
34+
-
35+
name: Prepare
36+
if: matrix.version != ''
37+
run: |
38+
echo "LIBRENMS_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
2739
-
2840
name: Checkout
2941
uses: actions/checkout@v3

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ RUN apk --update --no-cache add -t build-dependencies \
115115
linux-headers \
116116
musl-dev \
117117
python3-dev \
118+
&& echo "Installing LibreNMS https://github.com/librenms/librenms.git#${LIBRENMS_VERSION}..." \
118119
&& git clone --depth=1 --branch ${LIBRENMS_VERSION} https://github.com/librenms/librenms.git . \
119120
&& pip3 install --ignore-installed -r requirements.txt --upgrade \
120121
&& COMPOSER_CACHE_DIR="/tmp" composer install --no-dev --no-interaction --no-ansi \

docker-bake.hcl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@ variable "DEFAULT_TAG" {
22
default = "librenms:local"
33
}
44

5+
variable "LIBRENMS_VERSION" {
6+
default = null
7+
}
8+
59
// Special target: https://github.com/docker/metadata-action#bake-definition
610
target "docker-metadata-action" {
711
tags = ["${DEFAULT_TAG}"]
12+
args = {
13+
LIBRENMS_VERSION = LIBRENMS_VERSION
14+
}
815
}
916

1017
// Default target if none specified

0 commit comments

Comments
 (0)