Skip to content

Commit 50d9cf6

Browse files
rwaffenrwaffen
authored
Merge pull request #161 from voxpupuli/fix_ci
fix: use openvox in all ci
2 parents 8a04064 + 2cd3711 commit 50d9cf6

File tree

4 files changed

+47
-38
lines changed

4 files changed

+47
-38
lines changed

‎.github/workflows/build_container.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
matrix: ${{ fromJson(needs.setup-matrix.outputs.build_matrix) }}
4242
steps:
43-
- name: Build Vox Pupuli Test Container v${{ matrix.puppet_release }}-${{ matrix.platform }}
43+
- name: Build Vox Pupuli Test Container v${{ matrix.openvox_release }}-${{ matrix.platform }}
4444
uses: voxpupuli/gha-build-and-publish-a-container@v2
4545
with:
4646
registry_password: ${{ secrets.GITHUB_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
6565
docker_username: voxpupulibot
6666
docker_password: ${{ secrets.DOCKERHUB_BOT_ADMIN_TOKEN }}
6767
tags: |
68-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-${{ matrix.platform }}
68+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-${{ matrix.platform }}
6969
7070
create-multiarch-manifests:
7171
runs-on: ubuntu-latest
@@ -95,52 +95,52 @@ jobs:
9595
- name: Create multiarch manifests
9696
run: |
9797
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.rubygem_openvox }}-${{ github.ref_name }} \
98-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
99-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
98+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
99+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
100100
101101
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.rubygem_openvox }}-latest \
102-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
103-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
102+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
103+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
104104
105-
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }}-${{ github.ref_name }} \
106-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
107-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
105+
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }}-${{ github.ref_name }} \
106+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
107+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
108108
109-
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }} \
110-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
111-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
109+
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }} \
110+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
111+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
112112
113-
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }}-latest \
114-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
115-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
113+
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }}-latest \
114+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
115+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
116116
117117
docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/voxbox:latest \
118-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
119-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
118+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
119+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
120120
121121
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.rubygem_openvox }}-${{ github.ref_name }} \
122-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
123-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
122+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
123+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
124124
125125
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.rubygem_openvox }}-latest \
126-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
127-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
126+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
127+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
128128
129-
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }}-${{ github.ref_name }} \
130-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
131-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
129+
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }}-${{ github.ref_name }} \
130+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
131+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
132132
133-
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }} \
134-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
135-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
133+
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }} \
134+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
135+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
136136
137-
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.puppet_release }}-latest \
138-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
139-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
137+
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:${{ matrix.openvox_release }}-latest \
138+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
139+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
140140
141141
docker buildx imagetools create -t docker.io/${{ github.repository_owner }}/voxbox:latest \
142-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-arm64 \
143-
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.puppet_release }}-amd64
142+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-arm64 \
143+
ghcr.io/${{ github.repository_owner }}/voxbox:${{ github.sha }}-v${{ matrix.openvox_release }}-amd64
144144
145145
update-dockerhub-description:
146146
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ permissions:
1515
jobs:
1616
release:
1717
name: Release
18-
uses: voxpupuli/crafty/.github/workflows/release.yml@main
19-
with:
20-
allowed_owner: voxpupuli
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: write
21+
steps:
22+
- uses: actions/checkout@v5
23+
with:
24+
fetch-depth: 0
25+
26+
- name: Create Release
27+
env:
28+
GH_TOKEN: ${{ github.token }}
29+
run: gh release create ${{ github.ref_name }} --generate-notes

‎build_versions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
include:
3-
- puppet_release: 8
3+
- openvox_release: 8
44
base_image: 'docker.io/ruby:3.2.5-alpine3.20'
55
rubygem_bundler: '2.7.2'
66
rubygem_modulesync: '4.2.0'

‎matrix.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if [ "$1" == "build" ]; then
88
fi
99

1010
if [ "$1" == "tag" ]; then
11-
# jq -s '(.[0].platforms[] | .platform) as $platform | (.[1].include[] | .puppet_release) as $release | { puppet_release: $release, platform: $platform }' build_platforms.json build_versions.json | jq -s '{include: .}'
12-
jq -cr '.include |= map({ puppet_release: .puppet_release, rubygem_puppet: .rubygem_puppet })' build_versions.json
11+
# jq -s '(.[0].platforms[] | .platform) as $platform | (.[1].include[] | .openvox_release) as $release | { openvox_release: $release, platform: $platform }' build_platforms.json build_versions.json | jq -s '{include: .}'
12+
jq -cr '.include |= map({ openvox_release: .openvox_release, rubygem_openvox: .rubygem_openvox })' build_versions.json
1313
fi
1414

1515
rm build_platforms.json

0 commit comments

Comments
 (0)