Skip to content

Commit ae98f36

Browse files
committed
feat: refactor for renovate version automated updating
1 parent d31ae90 commit ae98f36

File tree

7 files changed

+36
-16
lines changed

7 files changed

+36
-16
lines changed

.github/workflows/build_container.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ jobs:
1717
- name: Source checkout
1818
uses: actions/checkout@v4
1919

20+
- name: 'Setup yq'
21+
uses: dcarbone/[email protected]
22+
2023
- id: set-matrix
21-
run: echo "matrix=$(cat build_versions.json | jq -c)" >> $GITHUB_OUTPUT
24+
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
2225

2326
build-X86-container:
2427
runs-on: ubuntu-24.04

.github/workflows/ci.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ jobs:
1616
- name: Source checkout
1717
uses: actions/checkout@v4
1818

19+
- name: 'Setup yq'
20+
uses: dcarbone/[email protected]
21+
1922
- id: set-matrix
20-
run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT
23+
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
2124

2225
build_test_container:
2326
name: 'Build test container'

.github/workflows/security_scanning.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ jobs:
1818
- name: Source checkout
1919
uses: actions/checkout@v4
2020

21+
- name: 'Setup yq'
22+
uses: dcarbone/[email protected]
23+
2124
- id: set-matrix
22-
run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT
25+
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
2326

2427
scan_ci_container:
2528
name: 'Scan CI container'

Containerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ FROM ubuntu:24.04
33
ARG OPENVOX_RELEASE=8
44
ARG OPENVOX_USER_UID=999
55
ARG OPENVOX_USER_GID=999
6-
ARG OPENVOXAGENT_VERSION=8.11.0
76
ARG UBUNTU_VERSION=24.04
7+
ARG OPENVOXAGENT_VERSION=8.11.0-1+ubuntu${UBUNTU_VERSION}
8+
ARG OPENVOX_RELEASE_PACKAGE=openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb
89

9-
ADD https://apt.overlookinfratech.com/openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb /
10+
ADD https://apt.overlookinfratech.com/${OPENVOX_RELEASE_PACKAGE} /
1011
RUN apt-get update && \
11-
apt-get install -y ca-certificates /openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb && \
12-
rm /openvox${OPENVOX_RELEASE}-release-ubuntu${UBUNTU_VERSION}.deb
12+
apt-get install -y ca-certificates /${OPENVOX_RELEASE_PACKAGE} && \
13+
rm /${OPENVOX_RELEASE_PACKAGE}
1314

1415
RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
1516
useradd -m -u ${OPENVOX_USER_UID} -g puppet puppet && \
1617
apt-get update && \
1718
apt-get upgrade -y && \
18-
apt-get install -y openvox-agent=${OPENVOXAGENT_VERSION}-* && \
19+
apt-get install -y openvox-agent=${OPENVOXAGENT_VERSION} && \
1920
apt-get autoremove -y && \
2021
apt-get clean && \
2122
rm -rf /var/lib/apt/lists/*

build_versions.json

-8
This file was deleted.

build_versions.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
include:
3+
- release: 8
4+
# renovate: depName=openvox-agent OpenVoxRelease=8
5+
agent_version: 8.11.0-1+ubuntu24.04

renovate.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:recommended"],
4+
"customManagers": [
5+
{
6+
"customType": "regex",
7+
"fileMatch": ["build_versions.yaml"],
8+
"matchStrings": ["#\\s*renovate:\\s*depName=(?<depName>.*?)\\s*OpenVoxRelease=(?<OpenVoxRelease>\\d+)\\s*\\n\\s*(?<key>\\w+_version):\\s*\"(?<currentValue>.*?)\""],
9+
"registryUrlTemplate": "https://apt.overlookinfratech.com?suite=ubuntu24.04&components=openvox{{OpenVoxRelease}}",
10+
"datasourceTemplate": "deb"
11+
}
12+
]
13+
}

0 commit comments

Comments
 (0)