Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back some fedora python dependencies #90

Merged
merged 16 commits into from
Dec 6, 2024
11 changes: 6 additions & 5 deletions .github/workflows/.container.template.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/<{ workflow_file_name }>'
- '<{ repository_path }>/*'
- '<{ repository_path }>/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/<{ workflow_file_name }>'
- '<{ repository_path }>/*'
- '<{ repository_path }>/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/amazonlinux-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/amazonlinux-containers.yml'
- 'mirrors/amazonlinux/*'
- 'mirrors/amazonlinux/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/amazonlinux-containers.yml'
- 'mirrors/amazonlinux/*'
- 'mirrors/amazonlinux/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/archlinux-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/archlinux-containers.yml'
- 'mirrors/archlinux/*'
- 'mirrors/archlinux/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/archlinux-containers.yml'
- 'mirrors/archlinux/*'
- 'mirrors/archlinux/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/builddocs-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/builddocs-containers.yml'
- 'custom/builddocs/*'
- 'custom/builddocs/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/builddocs-containers.yml'
- 'custom/builddocs/*'
- 'custom/builddocs/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/busybox-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/busybox-containers.yml'
- 'mirrors/busybox/*'
- 'mirrors/busybox/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/busybox-containers.yml'
- 'mirrors/busybox/*'
- 'mirrors/busybox/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/consul-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/consul-containers.yml'
- 'mirrors/consul/*'
- 'mirrors/consul/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/consul-containers.yml'
- 'mirrors/consul/*'
- 'mirrors/consul/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,10 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
timeout-minutes: 600
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/debian-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/debian-containers.yml'
- 'mirrors/debian/*'
- 'mirrors/debian/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/debian-containers.yml'
- 'mirrors/debian/*'
- 'mirrors/debian/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/etcd-v2-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
paths:
- containers.yml
- '.github/workflows/etcd-v2-containers.yml'
- 'mirrors/etcd-v2/*'
- 'mirrors/etcd-v2/**'
pull_request:
paths:
- containers.yml
- '.github/workflows/etcd-v2-containers.yml'
- 'mirrors/etcd-v2/*'
- 'mirrors/etcd-v2/**'

env:
COLUMNS: 190
Expand All @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,9 +62,10 @@ jobs:
tools ci matrix ${{ env.PATH_IN_REPO }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: matrix-generator
name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
timeout-minutes: 600
strategy:
fail-fast: false
max-parallel: 10
Expand Down Expand Up @@ -149,7 +150,7 @@ jobs:
retention-days: 1

merge:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}

Expand Down
Loading
Loading