Skip to content

Commit

Permalink
Merge pull request #144 from zakkg3/fix-build
Browse files Browse the repository at this point in the history
Fix build
  • Loading branch information
zakkg3 authored Sep 25, 2024
2 parents 71c0d40 + 740c5ea commit ccf585a
Show file tree
Hide file tree
Showing 6 changed files with 211 additions and 70 deletions.
65 changes: 0 additions & 65 deletions .github/workflows/build-alt.yaml

This file was deleted.

206 changes: 206 additions & 0 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
# Docker build images on tag
name: Test Builds Images
on: [pull_request]

env:
IMAGE_TAGS: ${{ github.ref_name }}
REGISTRY_USER: clustersecret
IMAGE_REGISTRY: quay.io
IMAGE_NAMESPACE : clustersecret

jobs:
build-amd64:
name: Build amd64
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
steps:
# Checkout push-to-registry action github repository
- name: Checkout Push to Registry action
uses: actions/checkout@v2

# - name: Install latest podman
# if: matrix.install_latest
# run: |
# bash .github/install_latest_podman.sh

- name: Install qemu dependency
# we need quemu-user-static for builds other archs with buildah
# /~https://github.com/containers/podman/issues/13924#issuecomment-1103434554
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
- name: Build amd64
id: build_image386
uses: redhat-actions/buildah-build@main
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }}
platforms: linux/amd64
containerfiles: |
./Dockerfile.gh
- name: Echo outputs
run: |
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
build-386:
name: Build 386
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
steps:
# Checkout push-to-registry action github repository
- name: Checkout Push to Registry action
uses: actions/checkout@v2

# - name: Install latest podman
# if: matrix.install_latest
# run: |
# bash .github/install_latest_podman.sh

- name: Install qemu dependency
# we need quemu-user-static for builds other archs with buildah
# /~https://github.com/containers/podman/issues/13924#issuecomment-1103434554
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
- name: Build alt Image 386
id: build_image386
uses: redhat-actions/buildah-build@main
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }}
platforms: linux/386
containerfiles: |
./Dockerfile.gh
- name: Echo outputs
run: |
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
build-s390:
name: Builds 390
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
steps:
# Checkout push-to-registry action github repository
- name: Checkout Push to Registry action
uses: actions/checkout@v2

# - name: Install latest podman
# if: matrix.install_latest
# run: |
# bash .github/install_latest_podman.sh

- name: Install qemu dependency
# we need quemu-user-static for builds other archs with buildah
# /~https://github.com/containers/podman/issues/13924#issuecomment-1103434554
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
sudo apt-get install -y rustc
- name: Build alt Image s390
id: build_image390
uses: redhat-actions/buildah-build@main
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }}
platforms: linux/s390x
containerfiles: |
./Dockerfile.gh
- name: Echo outputs
run: |
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
build-armv8:
name: Build armv8
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
steps:
# Checkout push-to-registry action github repository
- name: Checkout Push to Registry action
uses: actions/checkout@v2

# - name: Install latest podman
# if: matrix.install_latest
# run: |
# bash .github/install_latest_podman.sh

- name: Install qemu dependency
# we need quemu-user-static for builds other archs with buildah
# /~https://github.com/containers/podman/issues/13924#issuecomment-1103434554
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
sudo apt-get install -y rustc
- name: Build alt Image armv8
id: build_alt_imagev8
uses: redhat-actions/buildah-build@main
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }}
platforms: linux/arm64/v8
containerfiles: |
./Dockerfile.gh
- name: Echo outputs
run: |
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
build-armv7:
name: Build armv7 #note it needs build essentials (uses docker-others)
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# install_latest: [ true, false ] #ubuntu-20.04 has a good enough podman.
steps:
# Checkout push-to-registry action github repository
- name: Checkout Push to Registry action
uses: actions/checkout@v2

# - name: Install latest podman
# if: matrix.install_latest
# run: |
# bash .github/install_latest_podman.sh

- name: Install qemu dependency
# we need quemu-user-static for builds other archs with buildah
# /~https://github.com/containers/podman/issues/13924#issuecomment-1103434554
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
sudo apt-get install -y rustc
- name: Build alt Image armv7
id: build_alt_imagev7
uses: redhat-actions/buildah-build@main
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }}
platforms: linux/arm/v7
containerfiles: |
./Dockerfile-others.gh
- name: Echo outputs
run: |
echo "${{ toJSON(steps.push-to-quay.outputs) }}"
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
build-push-quay:
name: Build&Push
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
with:
image: ${{ env.IMAGE_NAMESPACE }}
tags: ${{ env.IMAGE_TAGS }} latest
platforms: linux/386, linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64/v8
platforms: linux/386, linux/amd64, linux/s390x, linux/arm64/v8
containerfiles: |
./Dockerfile.gh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-testing.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: E2E Testing

on: [push, pull_request]
on: [pull_request]

jobs:
e2e-tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/py-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.9", "3.10","3.11"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kopf===1.37.2
kubernetes===19.15.0
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
pydantic==2.4.0
pydantic==2.3.0

0 comments on commit ccf585a

Please sign in to comment.