Skip to content

Commit ccf585a

Browse files
zakkg3zakkg3
authored
Merge pull request #144 from zakkg3/fix-build
Fix build
2 parents 71c0d40 + 740c5ea commit ccf585a

File tree

6 files changed

+211
-70
lines changed

6 files changed

+211
-70
lines changed

‎.github/workflows/build-alt.yaml

-65
This file was deleted.

‎.github/workflows/build-test.yaml

+206
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
# Docker build images on tag
2+
name: Test Builds Images
3+
on: [pull_request]
4+
5+
env:
6+
IMAGE_TAGS: ${{ github.ref_name }}
7+
REGISTRY_USER: clustersecret
8+
IMAGE_REGISTRY: quay.io
9+
IMAGE_NAMESPACE : clustersecret
10+
11+
jobs:
12+
build-amd64:
13+
name: Build amd64
14+
runs-on: ubuntu-24.04
15+
# strategy:
16+
# fail-fast: false
17+
# matrix:
18+
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
19+
steps:
20+
# Checkout push-to-registry action github repository
21+
- name: Checkout Push to Registry action
22+
uses: actions/checkout@v2
23+
24+
# - name: Install latest podman
25+
# if: matrix.install_latest
26+
# run: |
27+
# bash .github/install_latest_podman.sh
28+
29+
- name: Install qemu dependency
30+
# we need quemu-user-static for builds other archs with buildah
31+
# https://github.com/containers/podman/issues/13924#issuecomment-1103434554
32+
run: |
33+
sudo apt-get update
34+
sudo apt-get install -y qemu-user-static
35+
36+
- name: Build amd64
37+
id: build_image386
38+
uses: redhat-actions/buildah-build@main
39+
with:
40+
image: ${{ env.IMAGE_NAMESPACE }}
41+
tags: ${{ env.IMAGE_TAGS }}
42+
platforms: linux/amd64
43+
containerfiles: |
44+
./Dockerfile.gh
45+
46+
- name: Echo outputs
47+
run: |
48+
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
49+
50+
51+
build-386:
52+
name: Build 386
53+
runs-on: ubuntu-24.04
54+
# strategy:
55+
# fail-fast: false
56+
# matrix:
57+
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
58+
steps:
59+
# Checkout push-to-registry action github repository
60+
- name: Checkout Push to Registry action
61+
uses: actions/checkout@v2
62+
63+
# - name: Install latest podman
64+
# if: matrix.install_latest
65+
# run: |
66+
# bash .github/install_latest_podman.sh
67+
68+
- name: Install qemu dependency
69+
# we need quemu-user-static for builds other archs with buildah
70+
# https://github.com/containers/podman/issues/13924#issuecomment-1103434554
71+
run: |
72+
sudo apt-get update
73+
sudo apt-get install -y qemu-user-static
74+
75+
- name: Build alt Image 386
76+
id: build_image386
77+
uses: redhat-actions/buildah-build@main
78+
with:
79+
image: ${{ env.IMAGE_NAMESPACE }}
80+
tags: ${{ env.IMAGE_TAGS }}
81+
platforms: linux/386
82+
containerfiles: |
83+
./Dockerfile.gh
84+
85+
- name: Echo outputs
86+
run: |
87+
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
88+
89+
90+
build-s390:
91+
name: Builds 390
92+
runs-on: ubuntu-24.04
93+
# strategy:
94+
# fail-fast: false
95+
# matrix:
96+
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
97+
steps:
98+
# Checkout push-to-registry action github repository
99+
- name: Checkout Push to Registry action
100+
uses: actions/checkout@v2
101+
102+
# - name: Install latest podman
103+
# if: matrix.install_latest
104+
# run: |
105+
# bash .github/install_latest_podman.sh
106+
107+
- name: Install qemu dependency
108+
# we need quemu-user-static for builds other archs with buildah
109+
# https://github.com/containers/podman/issues/13924#issuecomment-1103434554
110+
run: |
111+
sudo apt-get update
112+
sudo apt-get install -y qemu-user-static
113+
sudo apt-get install -y rustc
114+
115+
- name: Build alt Image s390
116+
id: build_image390
117+
uses: redhat-actions/buildah-build@main
118+
with:
119+
image: ${{ env.IMAGE_NAMESPACE }}
120+
tags: ${{ env.IMAGE_TAGS }}
121+
platforms: linux/s390x
122+
containerfiles: |
123+
./Dockerfile.gh
124+
125+
- name: Echo outputs
126+
run: |
127+
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
128+
129+
130+
build-armv8:
131+
name: Build armv8
132+
runs-on: ubuntu-24.04
133+
# strategy:
134+
# fail-fast: false
135+
# matrix:
136+
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
137+
steps:
138+
# Checkout push-to-registry action github repository
139+
- name: Checkout Push to Registry action
140+
uses: actions/checkout@v2
141+
142+
# - name: Install latest podman
143+
# if: matrix.install_latest
144+
# run: |
145+
# bash .github/install_latest_podman.sh
146+
147+
- name: Install qemu dependency
148+
# we need quemu-user-static for builds other archs with buildah
149+
# https://github.com/containers/podman/issues/13924#issuecomment-1103434554
150+
run: |
151+
sudo apt-get update
152+
sudo apt-get install -y qemu-user-static
153+
sudo apt-get install -y rustc
154+
155+
- name: Build alt Image armv8
156+
id: build_alt_imagev8
157+
uses: redhat-actions/buildah-build@main
158+
with:
159+
image: ${{ env.IMAGE_NAMESPACE }}
160+
tags: ${{ env.IMAGE_TAGS }}
161+
platforms: linux/arm64/v8
162+
containerfiles: |
163+
./Dockerfile.gh
164+
165+
- name: Echo outputs
166+
run: |
167+
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
168+
169+
build-armv7:
170+
name: Build armv7 #note it needs build essentials (uses docker-others)
171+
runs-on: ubuntu-24.04
172+
# strategy:
173+
# fail-fast: false
174+
# matrix:
175+
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
176+
steps:
177+
# Checkout push-to-registry action github repository
178+
- name: Checkout Push to Registry action
179+
uses: actions/checkout@v2
180+
181+
# - name: Install latest podman
182+
# if: matrix.install_latest
183+
# run: |
184+
# bash .github/install_latest_podman.sh
185+
186+
- name: Install qemu dependency
187+
# we need quemu-user-static for builds other archs with buildah
188+
# https://github.com/containers/podman/issues/13924#issuecomment-1103434554
189+
run: |
190+
sudo apt-get update
191+
sudo apt-get install -y qemu-user-static
192+
sudo apt-get install -y rustc
193+
194+
- name: Build alt Image armv7
195+
id: build_alt_imagev7
196+
uses: redhat-actions/buildah-build@main
197+
with:
198+
image: ${{ env.IMAGE_NAMESPACE }}
199+
tags: ${{ env.IMAGE_TAGS }}
200+
platforms: linux/arm/v7
201+
containerfiles: |
202+
./Dockerfile-others.gh
203+
204+
- name: Echo outputs
205+
run: |
206+
echo "${{ toJSON(steps.push-to-quay.outputs) }}"

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
build-push-quay:
1818
name: Build&Push
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-24.04
2020
# strategy:
2121
# fail-fast: false
2222
# matrix:
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
image: ${{ env.IMAGE_NAMESPACE }}
4646
tags: ${{ env.IMAGE_TAGS }} latest
47-
platforms: linux/386, linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64/v8
47+
platforms: linux/386, linux/amd64, linux/s390x, linux/arm64/v8
4848
containerfiles: |
4949
./Dockerfile.gh
5050

‎.github/workflows/e2e-testing.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: E2E Testing
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
66
e2e-tests:

‎.github/workflows/py-unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.9", "3.10"]
11+
python-version: ["3.9", "3.10","3.11"]
1212

1313
steps:
1414
- uses: actions/checkout@v3

‎src/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kopf===1.37.2
22
kubernetes===19.15.0
33
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
4-
pydantic==2.4.0
4+
pydantic==2.3.0

0 commit comments

Comments
 (0)