Skip to content

Commit

Permalink
Merge branch 'main' into 00499-charts-support-key-secrets
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromy-cannon authored Aug 21, 2024
2 parents 0273b36 + 828995a commit bc30333
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ permissions:
jobs:
prepare-release:
name: Release / Prepare
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
outputs:
version: ${{ steps.tag.outputs.version }}
steps:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

publish-docker-image:
name: Publish / Docker Image
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
needs:
- prepare-release
steps:
Expand All @@ -138,31 +138,31 @@ jobs:
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

- name: Build Docker Image (ubi8-init-dind)
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: docker/ubi8-init-dind
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-dind:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (ubi8-init-java17)
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: docker/ubi8-init-java17
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-java17:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (ubi8-init-java21)
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: docker/ubi8-init-java21
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-java21:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (kubectl-bats)
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: docker/kubectl-bats
platforms: linux/amd64, linux/arm64
Expand All @@ -171,7 +171,7 @@ jobs:

publish-helm-charts:
name: Publish / Helm Charts
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
needs:
- prepare-release
steps:
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:

create-github-release:
name: Github / Release
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
needs:
- publish-maven-central
- publish-docker-image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flow-pull-request-formatting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ concurrency:
jobs:
title-check:
name: Title Check
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
steps:
- name: Check PR Title
uses: step-security/conventional-pr-title-action@19fb561b33015fd2184055a05ce5a3bcf2ba3f54 # v3.2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxc-code-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ env:
jobs:
analyze:
name: ${{ inputs.custom-job-label || 'Analyze' }}
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
steps:
- name: Checkout Code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxc-compile-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ env:
jobs:
compile:
name: ${{ inputs.custom-job-label || 'Compiles' }}
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
steps:
- name: Checkout Code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxc-helm-chart-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ permissions:
jobs:
test:
name: ${{ inputs.custom-job-label || 'Helm Chart Test' }} (${{ matrix.scriptName }})
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxc-release-maven-central.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ env:
jobs:
release:
name: ${{ inputs.custom-job-label || 'Release' }}
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
outputs:
notes: ${{ steps.create-release-notes.outputs.RELEASE_NOTES }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxf-snyk-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
jobs:
snyk:
name: Snyk Monitor
runs-on: [self-hosted, Linux, medium, ephemeral]
runs-on: solo-linux-medium
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down

0 comments on commit bc30333

Please sign in to comment.