Skip to content

Commit 5089bc3

Browse files
committed
fix: extract server and database version numbers in CI workflows
1 parent 116bddf commit 5089bc3

File tree

2 files changed

+38
-11
lines changed

2 files changed

+38
-11
lines changed

.github/workflows/build_container.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ jobs:
2323
- id: set-matrix
2424
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
2525

26+
- name: Extract server version number
27+
id: extract_server_version
28+
uses: actions/github-script@v7
29+
with:
30+
script: |
31+
const serverVersion = '${{ steps.set-matrix.outputs.matrix.server_version }}';
32+
const server_version = serverVersion.split('-')[0];
33+
core.setOutput('server_version', server_version);
34+
35+
- name: Extract db version number
36+
id: extract_db_version
37+
uses: actions/github-script@v7
38+
with:
39+
script: |
40+
const dbVersion = '${{ steps.set-matrix.outputs.matrix.db_version }}';
41+
const db_version = dbVersion.split('-')[0];
42+
core.setOutput('db_version', db_version);
43+
2644
build-X86-container:
2745
runs-on: ubuntu-24.04
2846
permissions:
@@ -55,8 +73,8 @@ jobs:
5573
registry_password: ${{ secrets.GITHUB_TOKEN }}
5674
build_args: |
5775
OPENVOX_RELEASE=${{ matrix.release }}
58-
OPENVOXSERVER_VERSION=${{ matrix.server_version }}
59-
OPENVOXDB_VERSION=${{ matrix.db_version }}
76+
OPENVOXSERVER_VERSION=${{ needs.setup-matrix.outputs.server_version }}
77+
OPENVOXDB_VERSION=${{ needs.setup-matrix.outputs.db_version }}
6078
R10K_VERSION=${{ matrix.r10k_version }}
6179
build_arch: linux/amd64
6280
build_context: openvoxserver

.github/workflows/ci.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,28 @@ jobs:
4444
- name: Checkout repository
4545
uses: actions/checkout@v4
4646

47-
- name: Extract version number
48-
id: extract_version
47+
- name: Extract server version number
48+
id: extract_server_version
4949
uses: actions/github-script@v7
5050
with:
5151
script: |
52-
const agentVersion = '${{ matrix.server_version }}';
53-
const version = agentVersion.split('-')[0];
54-
core.setOutput('version', version);
52+
const serverVersion = '${{ matrix.server_version }}';
53+
const server_version = serverVersion.split('-')[0];
54+
core.setOutput('server_version', server_version);
55+
56+
- name: Extract db version number
57+
id: extract_db_version
58+
uses: actions/github-script@v7
59+
with:
60+
script: |
61+
const dbVersion = '${{ matrix.db_version }}';
62+
const db_version = dbVersion.split('-')[0];
63+
core.setOutput('db_version', db_version);
5564
5665
- name: Build Ubuntu image
5766
uses: docker/build-push-action@v6
5867
with:
59-
tags: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}'
68+
tags: 'ci/openvoxserver:${{ steps.extract_server_version.outputs.server_version }}'
6069
context: openvoxserver
6170
file: openvoxserver/Containerfile
6271
push: false
@@ -71,14 +80,14 @@ jobs:
7180
if: ${{ matrix.release == '8' }}
7281
uses: docker/build-push-action@v6
7382
with:
74-
tags: 'ci/openvoxserver:${{ steps.extract_version.outputs.version }}-alpine'
83+
tags: 'ci/openvoxserver:${{ steps.extract_server_version.outputs.server_version }}-alpine'
7584
context: openvoxserver
7685
file: openvoxserver/Containerfile.alpine
7786
push: false
7887
build-args: |
7988
OPENVOX_RELEASE=${{ matrix.release }}
80-
OPENVOXSERVER_VERSION=${{ matrix.server_version }}
81-
OPENVOXDB_VERSION=${{ matrix.db_version }}
89+
OPENVOXSERVER_VERSION=${{ steps.extract_server_version.outputs.server_version }}
90+
OPENVOXDB_VERSION=${{ steps.extract_db_version.outputs.db_version }}
8291
R10K_VERSION=${{ matrix.r10k_version }}
8392
8493
tests:

0 commit comments

Comments
 (0)