aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2022-02-13 11:03:42 -0800
committerGravatar MarkKoz <[email protected]>2022-02-13 11:03:42 -0800
commit6b3ec282eeaacda54362d4b822f4797a93f1129b (patch)
tree24aea4730c83738ecb36423e9bbafdb3603fe4f9
parentCI: remove region comments (diff)
CI: replace "artefact" with "artifact"
The latter is consistent with GitHub Action's documentation.
-rw-r--r--.github/workflows/build.yaml18
-rw-r--r--.github/workflows/deploy.yaml8
-rw-r--r--.github/workflows/main.yaml4
-rw-r--r--.github/workflows/test.yaml8
4 files changed, 19 insertions, 19 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f71d022..51de09f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,9 +1,9 @@
on:
workflow_call:
outputs:
- artefact:
+ artifact:
description: The name of the uploaded image aretfact.
- value: ${{ jobs.build.outputs.artefact }}
+ value: ${{ jobs.build.outputs.artifact }}
tag:
description: The tag used for the built image.
value: ${{ jobs.build.outputs.tag }}
@@ -13,10 +13,10 @@ jobs:
name: Build snekbox-venv image
runs-on: ubuntu-latest
outputs:
- artefact: ${{ env.artefact }}
+ artifact: ${{ env.artifact }}
tag: ${{ steps.sha_tag.outputs.tag }}
env:
- artefact: image_artefact_snekbox-venv
+ artifact: image_artifact_snekbox-venv
steps:
# Create a short SHA with which to tag built images.
@@ -77,7 +77,7 @@ jobs:
push: false
target: venv
build-args: DEV=1
- outputs: type=docker,dest=${{ env.artefact }}.tar
+ outputs: type=docker,dest=${{ env.artifact }}.tar
cache-from: |
${{ steps.cache_config.outputs.cache_from }}
ghcr.io/python-discord/snekbox-base:latest
@@ -85,12 +85,12 @@ jobs:
cache-to: ${{ steps.cache_config.outputs.cache_to }}
tags: ghcr.io/python-discord/snekbox-venv:${{ steps.sha_tag.outputs.tag }}
- # Make the image available as an artefact so other jobs will be able to
+ # Make the image available as an artifact so other jobs will be able to
# download it.
- - name: Upload image archive as an artefact
+ - name: Upload image archive as an artifact
uses: actions/upload-artifact@v2
with:
- name: ${{ env.artefact }}
- path: ${{ env.artefact }}.tar
+ name: ${{ env.artifact }}
+ path: ${{ env.artifact }}.tar
retention-days: 1 # It's only needed for the duration of the workflow.
if-no-files-found: error
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 99fb6d2..c4020b9 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,7 +1,7 @@
on:
workflow_call:
inputs:
- artefact:
+ artifact:
required: true
type: string
tag:
@@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Download image artefact
+ - name: Download image artifact
uses: actions/download-artifact@v2
with:
- name: ${{ inputs.artefact }}
+ name: ${{ inputs.artifact }}
# Load the image to make use of common layers during the final build.
- name: Load image from archive
- run: docker load -i ${{ inputs.artefact }}.tar
+ run: docker load -i ${{ inputs.artifact }}.tar
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index f82770d..516a1d6 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -15,12 +15,12 @@ jobs:
uses: ./.github/workflows/test.yaml
needs: build
with:
- artefact: ${{ needs.build.outputs.artefact }}
+ artifact: ${{ needs.build.outputs.artifact }}
tag: ${{ needs.build.outputs.tag }}
deploy:
uses: ./.github/workflows/deploy.yaml
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
needs: [build, lint, test]
with:
- artefact: ${{ needs.build.outputs.artefact }}
+ artifact: ${{ needs.build.outputs.artifact }}
tag: ${{ needs.build.outputs.tag }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f2bf6f0..77ef1fc 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,7 +1,7 @@
on:
workflow_call:
inputs:
- artefact:
+ artifact:
required: true
type: string
tag:
@@ -17,13 +17,13 @@ jobs:
os: [ubuntu-20.04, self-hosted]
steps:
- - name: Download image artefact
+ - name: Download image artifact
uses: actions/download-artifact@v2
with:
- name: ${{ inputs.artefact }}
+ name: ${{ inputs.artifact }}
- name: Load image from archive
- run: docker load -i ${{ inputs.artefact }}.tar
+ run: docker load -i ${{ inputs.artifact }}.tar
# Needed for the Docker Compose file.
- name: Checkout code