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
18 changes: 9 additions & 9 deletions .github/workflows/acceptance_test_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
workflow_dispatch:

# Run the test when the new PR to develop is created
pull_request:
branches:
- develop
paths:
- 'backend/**'
- 'frontend/**'
- 'k8s/staging/**'
- 'infrastructure/staging/**'
- '.github/workflows/*staging*.yml'
# pull_request:
# branches:
# - develop
# paths:
# - 'backend/**'
# - 'frontend/**'
# - 'k8s/staging/**'
# - 'infrastructure/staging/**'
# - '.github/workflows/*staging*.yml'

env:
PYTHON_VERSION: "3.10"
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/cd-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:

env:
SHARED_ACR_LOGIN_SERVER: ${{ secrets.SHARED_ACR_LOGIN_SERVER }}
SHARED_ACR_NAME: ${{ secrets.SHARED_ACR_NAME }}

RESOURCE_GROUP_STAGING: sit722alice-staging-rg
AKS_CLUSTER_STAGING: sit722alice-staging-aks
Expand Down Expand Up @@ -53,17 +54,17 @@ jobs:
echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
echo "IMAGE_TAG=staging-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Build Backend Images (Notes Service)
- name: Build Backend Images
id: backend_images
run: |
NOTES_SERVICE_IMAGE="notes_service:${{ steps.vars.outputs.IMAGE_TAG }}"
USERS_SERVICE_IMAGE="users_service:${{ steps.vars.outputs.IMAGE_TAG }}"

docker build -t ${{ env.SHARED_ACR_LOGIN_SERVER }}/$NOTES_SERVICE_IMAGE ./backend/notes_service
docker build -t ${{ env.SHARED_ACR_LOGIN_SERVER }}/$USERS_SERVICE_IMAGE ./backend/users_service
echo "notes_service=$NOTES_SERVICE_IMAGE" >> $GITHUB_OUTPUT
echo "users_service=$USERS_SERVICE_IMAGE" >> $GITHUB_OUTPUT

echo "notes_service_image=$NOTES_SERVICE_IMAGE" >> $GITHUB_OUTPUT
echo "users_service_image=$USERS_SERVICE_IMAGE" >> $GITHUB_OUTPUT

# Image Vulnerability Scan with Trivy
security-scan:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/feature_test_notes_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ on:
- ".github/workflows/*notes_service*.yml"

# Re-run the test when the new PR to develop is created
pull_request:
branches:
- "develop"
# pull_request:
# branches:
# - "develop"

jobs:
quality-checks:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/feature_test_users_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ on:
- ".github/workflows/*users_service*.yml"

# Re-run the test when the new PR to develop is created
pull_request:
branches:
- "develop"
# pull_request:
# branches:
# - "develop"

jobs:
quality-checks:
Expand Down