Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
briancaffey committed Mar 7, 2024
2 parents 171f875 + 62fc255 commit 9355863
Show file tree
Hide file tree
Showing 25 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend_linting_and_unit_tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Backend / Unit Tests
name: '[CI] unit tests'

on:
push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend_update.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: '[CD] Backend update'
run-name: '[CD] Backend update ${{ inputs.VERSION }} on ${{ inputs.APP_ENV }}' # TODO: add parameters to name
name: '[CD] backend update'
run-name: '[CD] backend update ${{ inputs.VERSION }} on ${{ inputs.APP_ENV }}'

on:
workflow_dispatch:
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/ecr_backend.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: ECR | Backend - Build Image & Push to ECR
name: '[ECR] build and push'
run-name: '[ECR] build and push ${{ github.ref_name }}'

on:
push:
Expand All @@ -12,25 +13,26 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: "Build & Push Backend Docker Image"
env:
GIT_TAG: ${{ github.ref_name }}
AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
DOCKER_BUILDKIT: '1'
run: |
TAG="${GIT_TAG##*/}"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ecr_frontend.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: ECR | Frontend - Build Image & Push to ECR
name: '[ECR] build frontend image'
run-name: '[ECR] build frontend image ${{ github.ref_name }}'

on:
push:
Expand All @@ -25,7 +26,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: "Build & Push Frontend Docker Image"
env:
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/k6_load_test.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
# github action to create or update an ad hoc environment
name: k6 load test
name: '[k6] load test'
run-name: '[k6] load tests for ${{ inputs.url }}'

on:
workflow_dispatch:
inputs:

# The Terraform workspace for the shared resources Terraform configuration
# that the ad hoc environment will use.
# This input typically will not be used since all ad hoc environments should use one set of shared resources
# This may be changed if major changes to the shared resources configuration are made to avoid disrupting existing ad hoc environments
url:
URL:
description: 'URL to use for load test'
required: true
type: string
Expand All @@ -21,11 +17,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Run local k6 test
uses: grafana/k6-action@v0.2.0
uses: grafana/k6-action@v0.3.1
env:
BASE_URL: ${{ github.event.inputs.url }}
BASE_URL: ${{ inputs.URL }}
with:
filename: k6/script.js
9 changes: 5 additions & 4 deletions .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# GitHub Action for deploying documentation site to GitHub Pages
name: github pages
name: '[DOCS] github pages'
run-name: '[DOCS] github pages'

on:
workflow_dispatch:
Expand All @@ -12,15 +13,15 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "14"

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9355863

Please sign in to comment.