Skip to content

Commit

Permalink
Use ubuntu-22.04 runners
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Dec 5, 2024
1 parent 8ad065b commit 16be064
Show file tree
Hide file tree
Showing 30 changed files with 90 additions and 90 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/.container.template.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/amazonlinux-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/archlinux-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/builddocs-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/busybox-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/consul-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/debian-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/etcd-v2-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/etcd-v3-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/fedora-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/mariadb-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/mysql-server-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/openldap-minion-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
6 changes: 3 additions & 3 deletions .github/workflows/opensuse-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
matrix-generator:
name: Generate Matrix
runs-on: linux-x86_64
runs-on: ubuntu-22.04
outputs:
tags: ${{ steps.set-matrix.outputs.tags }}
name: ${{ steps.set-matrix.outputs.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ 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
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
Loading

0 comments on commit 16be064

Please sign in to comment.