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
4 changes: 3 additions & 1 deletion .github/actions/extract-branch-name/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,7 @@ runs:

- name: Echo branch name
shell: bash
env:
BRANCH_NAME: ${{ steps.extract.outputs.branch_name }}
run: |
echo "branch_name = '${{ steps.extract.outputs.branch_name }}'"
echo "branch_name = '${BRANCH_NAME}'"
14 changes: 8 additions & 6 deletions .github/workflows/cicd-1-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
image_tag: ${{ steps.set-metadata.outputs.image_tag }}
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: "Set CI/CD metadata"
id: set-metadata
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
changed: ${{ steps.detect.outputs.changed }}
steps:
- name: "Checkout PR branch"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
Expand All @@ -93,10 +93,10 @@ jobs:
# Compare PR head against base to find modules with provider constraint changes.
base_sha="${{ github.event.pull_request.base.sha }}"

# xargs -r avoids calling dirname with empty stdin when grep finds no matches.
mapfile -t modules_to_upgrade < <(
git diff --name-only "$base_sha...HEAD" \
| grep '^infrastructure/modules/.*/versions\.tf$' \
# -r avoids calling dirname with empty stdin when grep finds no matches.
| xargs -r -n1 dirname \
| sort -u
)
Expand Down Expand Up @@ -139,12 +139,14 @@ jobs:
# Push an auto-fix commit so the next PR workflow run validates the refreshed content.
if: steps.detect.outputs.changed == 'true'
shell: bash
env:
HEAD_REF: ${{ github.event.pull_request.head.ref }}
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add -A
git commit -m "chore(dependabot): regenerate terraform docs and lockfiles"
git push origin "HEAD:${{ github.event.pull_request.head.ref }}"
git push origin "HEAD:${HEAD_REF}"

- name: "Comment on PR with auto-fix summary"
if: steps.detect.outputs.changed == 'true'
Expand Down Expand Up @@ -300,7 +302,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: "Set up mise"
uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
Expand All @@ -322,7 +324,7 @@ jobs:
# contents: read
# steps:
# - name: Checkout code
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
# uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

# - name: Generate a token
# id: generate-token
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cicd-2-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
fetch-depth: 0
Expand All @@ -56,7 +56,7 @@ jobs:
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-tools-mise-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
timeout-minutes: 20
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: "Set up mise"
uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/stage-1-coding-standards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to scan all commits
- name: "Scan secrets"
Expand All @@ -62,7 +62,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check file format"
Expand All @@ -75,7 +75,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check Markdown format"
Expand All @@ -88,7 +88,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check English usage"
Expand All @@ -101,7 +101,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Lint Terraform"
uses: ./.github/actions/lint-terraform

Expand All @@ -116,7 +116,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Count lines of code"
uses: ./.github/actions/create-lines-of-code-report
with:
Expand All @@ -138,7 +138,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Scan dependencies"
uses: ./.github/actions/scan-dependencies
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/stage-1-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to scan all commits
- name: "Scan secrets"
Expand All @@ -61,7 +61,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check file format"
Expand All @@ -73,7 +73,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check Markdown format"
Expand All @@ -85,7 +85,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check English usage"
Expand All @@ -97,7 +97,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Lint Terraform"
uses: ./.github/actions/lint-terraform
count-lines-of-code:
Expand All @@ -109,7 +109,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Count lines of code"
uses: ./.github/actions/create-lines-of-code-report
with:
Expand All @@ -128,7 +128,7 @@ jobs:
timeout-minutes: 2
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Scan dependencies"
uses: ./.github/actions/scan-dependencies
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stage-1-pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
regenerate-dependabot-config check-available-modules
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/stage-2-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Run unit test suite"
run: |
make test-unit
Expand All @@ -52,7 +52,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Run linting"
run: |
make test-lint
Expand All @@ -66,7 +66,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: "Run test coverage check"
run: |
make test-coverage
Expand All @@ -83,7 +83,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0 # Full history is needed to improving relevancy of reporting
- name: "Perform static analysis"
Expand Down
4 changes: 2 additions & 2 deletions docs/developer-guides/Scripting_Docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ It is usually the case that there is a specific image that you will most often w

```make
build: # Build the project artefact @Pipeline
DOCKER_IMAGE=my-shiny-app
make docker-build
DOCKER_IMAGE=my-shiny-app
make docker-build
```

Now when you run `make build`, it will do the right thing. Keeping this convention consistent across projects means that new starters can be on-boarded quickly, without needing to learn a new set of conventions each time.
Expand Down
Loading