Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/docker-multistage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
if: ${{ inputs.stage_prev != '' }}

- name: "[Artifact Load] Import previously built image"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make load INFILE=${{ steps.set-artifact-name.outputs.prev }}
Expand All @@ -136,14 +136,14 @@ jobs:
# Build
# ------------------------------------------------------------
- name: Pull
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make docker-pull-base-image VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCH=${{ matrix.ARCH }}
if: ${{ inputs.pull_base_image }}

- name: Build
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make build VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCH=${{ matrix.ARCH }}
Expand All @@ -153,7 +153,7 @@ jobs:
# Test
# ------------------------------------------------------------
- name: Test
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make test VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCH=${{ matrix.ARCH }}
Expand All @@ -164,7 +164,7 @@ jobs:
# Push
# ------------------------------------------------------------
- name: Docker Tag
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make tag VERSION="${{ matrix.VERSION }}" STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -177,7 +177,7 @@ jobs:
if: ${{ inputs.push_image }}

- name: Docker push
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make push VERSION="${{ matrix.version }}" STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-multistage-push-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
name: ${{ steps.set-artifact-name.outputs.curr }}

- name: "[Artifact Load] Import previously built image"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make load INFILE=${{ steps.set-artifact-name.outputs.curr }}
Expand All @@ -111,7 +111,7 @@ jobs:
# Re-tag images
# ------------------------------------------------------------
- name: "[Docker Tag] Retag"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make tag VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -136,7 +136,7 @@ jobs:
# Push images
# ------------------------------------------------------------
- name: Push Image
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make push VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCH=${{ matrix.ARCH }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-multistage-push-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
# Create Manifest
# ------------------------------------------------------------
- name: "[Create Manifest] (${{ steps.manifest.outputs.arches }})"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-create VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -116,7 +116,7 @@ jobs:
# Deploy Manifest
# ------------------------------------------------------------
- name: "[Push Manifest] ${{ steps.tag.outputs.docker-tag }}"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-push VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} TAG=${{ steps.tag.outputs.docker-tag }}
4 changes: 2 additions & 2 deletions .github/workflows/docker-multistage-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
name: ${{ steps.set-artifact-name.outputs.curr }}

- name: "[Artifact Load] Import previously built image"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make load INFILE=${{ steps.set-artifact-name.outputs.curr }}
Expand All @@ -93,7 +93,7 @@ jobs:
# Test
# ------------------------------------------------------------
- name: Test
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make test VERSION=${{ matrix.VERSION }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.FLAVOUR }} ARCH=${{ matrix.ARCH }}
10 changes: 5 additions & 5 deletions .github/workflows/docker-name-version-arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
# Build
# ------------------------------------------------------------
- name: Build
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make build NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -161,7 +161,7 @@ jobs:
# Test
# ------------------------------------------------------------
- name: Test
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make test NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -177,7 +177,7 @@ jobs:
if: needs.configure.outputs.can_login == 1 && inputs.can_deploy

- name: Docker push architecture image
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make push NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand Down Expand Up @@ -239,13 +239,13 @@ jobs:
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: "[DEPLOY] Create Docker manifest for architectures: ${{ steps.manifest.outputs.arches }}"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-create NAME=${{ matrix.name }} VERSION=${{ matrix.version }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}

- name: "[DEPLOY] Publish Docker manifest: ${{ steps.tag.outputs.docker-tag }}"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-push NAME=${{ matrix.name }} VERSION=${{ matrix.version }} TAG=${{ steps.tag.outputs.docker-tag }}
12 changes: 6 additions & 6 deletions .github/workflows/docker-name-version-flavour-arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ jobs:
# Build
# ------------------------------------------------------------
- name: Pull Base
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make docker-pull-base-image VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }}

- name: Build
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
retries: 10
pause: 5
Expand All @@ -176,7 +176,7 @@ jobs:
# Test
# ------------------------------------------------------------
- name: Test
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make test NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand All @@ -192,7 +192,7 @@ jobs:
if: needs.configure.outputs.can_login == 1 && inputs.can_deploy

- name: Docker push architecture image
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make push NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} TAG=${{ steps.tag.outputs.docker-tag }}
Expand Down Expand Up @@ -254,13 +254,13 @@ jobs:
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: "[DEPLOY] Create Docker manifest for architectures: ${{ steps.manifest.outputs.arches }}"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-create NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}

- name: "[DEPLOY] Publish Docker manifest: ${{ steps.tag.outputs.docker-tag }}"
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make manifest-push NAME=${{ matrix.name }} VERSION="${{ matrix.version }}" FLAVOUR=${{ matrix.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
8 changes: 4 additions & 4 deletions .github/workflows/lint-generic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ jobs:
fetch-depth: 0

- name: Lint Files
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make lint-files

- name: Lint Yaml
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make lint-yaml

- name: Lint JSON
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make lint-json

- name: Lint Bash
uses: cytopia/shell-command-retry-action@v0.1.5
uses: cytopia/shell-command-retry-action@v0.1.6
with:
command: |
make lint-bash