Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
9395d31
ci: fix ACR login (use registry name from login server)
kiran497 Sep 11, 2025
bd3fba2
chore: trigger backend CI
kiran497 Sep 11, 2025
56689a2
cd: use check-acr instead of attach-acr (no Owner needed)
kiran497 Sep 11, 2025
c1989e3
Update backend-cd.yml
kiran497 Sep 11, 2025
3fca8ff
cd: replace attach-acr with check-acr; ensure LB; wait for IPs; corre…
kiran497 Sep 11, 2025
91decc4
Update frontend_ci.yml
kiran497 Sep 11, 2025
a74aee0
Update frontend_ci.yml
kiran497 Sep 11, 2025
2743a26
ci(frontend): use Podman with ACR token
kiran497 Sep 11, 2025
ad0d525
frontend: point to my AKS Product/Order URLs
kiran497 Sep 11, 2025
bdd9a8d
frontend: point to my AKS Product/Order URLs
kiran497 Sep 11, 2025
fb3d3a5
Update main.js
kiran497 Sep 11, 2025
5dc5ec7
WIP: pre-9.2C local changes (carryover from week8)
kiran497 Sep 22, 2025
e90d26e
Remove leaked azure credentials; switch to OIDC
kiran497 Sep 22, 2025
28c1c4d
9.2C: remove week8 CI/CD workflows
kiran497 Sep 22, 2025
fd7d5be
9.2C: add consolidated CI, release, linked deploy, policy checks
kiran497 Sep 22, 2025
3f8b4e1
Fix YAML: use block-style permissions/concurrency in release workflow
kiran497 Sep 22, 2025
50102bd
YAML fix: use block-style in reusable-ci and ci workflows
kiran497 Sep 22, 2025
9d3356a
chore: trigger CI after YAML fix
kiran497 Sep 22, 2025
9830984
chore: trigger CI on develop (non-ignored file)
kiran497 Sep 22, 2025
a7357a9
CI: robust install; make tests/lint non-blocking; ignore missing arti…
kiran497 Sep 22, 2025
4c7bbce
chore: trigger CI after CI robustness fix
kiran497 Sep 22, 2025
47453c1
CI: guard Node steps; make lint/test/build non-blocking; avoid cache …
kiran497 Sep 22, 2025
120d0b1
chore: trigger CI after guard fix
kiran497 Sep 22, 2025
cd75440
ci: fix ACR login (use registry name from login server)
kiran497 Sep 11, 2025
64a9fd5
chore: trigger backend CI
kiran497 Sep 11, 2025
e353f0b
cd: replace attach-acr with check-acr; ensure LB; wait for IPs; corre…
kiran497 Sep 11, 2025
acb9bae
Cleanup old workflows and add new backend/frontend CD workflows
kiran497 Sep 22, 2025
46cbecb
WIP: pre-9.2C local changes (carryover from week8)
kiran497 Sep 22, 2025
8d31d7b
Remove leaked azure credentials; switch to OIDC
kiran497 Sep 22, 2025
a9d101d
9.2C: remove week8 CI/CD workflows
kiran497 Sep 22, 2025
caa366d
9.2C: add consolidated CI, release, linked deploy, policy checks
kiran497 Sep 22, 2025
9748ace
Fix YAML: use block-style permissions/concurrency in release workflow
kiran497 Sep 22, 2025
9b93a77
YAML fix: use block-style in reusable-ci and ci workflows
kiran497 Sep 22, 2025
2f7812c
chore: trigger CI after YAML fix
kiran497 Sep 22, 2025
9ae6c2f
chore: trigger CI on develop (non-ignored file)
kiran497 Sep 22, 2025
7fa9c43
CI: robust install; make tests/lint non-blocking; ignore missing arti…
kiran497 Sep 22, 2025
a722108
chore: trigger CI after CI robustness fix
kiran497 Sep 22, 2025
e9d9826
Add backend/frontend CI and CD workflows, remove old workflows
kiran497 Sep 22, 2025
91655de
Add backend/frontend CI workflows
kiran497 Sep 22, 2025
4dc6fb4
CD: add backend and frontend deploy workflows for AKS
kiran497 Sep 22, 2025
b5941b2
Cleanup old workflows and add new backend/frontend CD workflows
kiran497 Sep 22, 2025
ba4a69e
Update backend-cd.yml
kiran497 Sep 22, 2025
514d89d
Update frontend-cd.yml
kiran497 Sep 22, 2025
17746d2
Update backend-cd.yml
kiran497 Sep 22, 2025
36cd478
Update backend-cd.yml
kiran497 Sep 22, 2025
10d22e0
Update frontend-cd.yml
kiran497 Sep 22, 2025
4c435d5
Update backend-cd.yml
kiran497 Sep 22, 2025
cf6b5db
Update frontend-cd.yml
kiran497 Sep 22, 2025
fc4e5bf
Update backend-cd.yml
kiran497 Sep 22, 2025
11f4ffa
CI: reusable workflow + PR/feature CI with path filters
kiran497 Sep 24, 2025
7fefa9c
Merge origin/develop into feature/ci-cd-upgrade: drop old CD workflow…
kiran497 Sep 24, 2025
c981887
Remove stray reusable-ci.yml; use _reusable-ci.yml only
kiran497 Sep 24, 2025
3ee630e
CI: skip Node steps when no package.json; robust install
kiran497 Sep 24, 2025
1745c2d
security: ignore azure_credentials.json
kiran497 Sep 24, 2025
6662274
CI: point to _reusable-ci.yml and run only on push
kiran497 Sep 25, 2025
2a3fb26
CD: build images and deploy to AKS (staging/prod)
kiran497 Sep 26, 2025
44bd94c
feat: small UI marker for staging
kiran497 Sep 26, 2025
58306c8
CI: manual build to ACR via reusable workflow
kiran497 Sep 26, 2025
87abf4b
CI: remove buildx gha cache to fix docker build
kiran497 Sep 26, 2025
36c1081
CI: fix docker build path (file relative to context)
kiran497 Sep 26, 2025
47595ad
CI: sanitize docker tag and use context Dockerfile
kiran497 Sep 26, 2025
71190ee
ci: final reusable-ci (explicit Dockerfile path + debug)
kiran497 Sep 26, 2025
34646f6
ci: reusable CI + manual build for frontend & both backend services
kiran497 Sep 26, 2025
6681762
CI: sanitize docker tag and set correct Dockerfile path
kiran497 Sep 26, 2025
7446de9
CI: disable Docker build in manual workflow
kiran497 Sep 26, 2025
6ae1af1
CI: manual ACR build (fixed Dockerfile path + sanitized tags)
kiran497 Sep 26, 2025
76b0594
CI: build images from correct service folders + safe tags
kiran497 Sep 26, 2025
7e77fd3
CI: split reusable + manual workflows; correct docker paths
kiran497 Sep 26, 2025
253f75b
CD: build/push images to ACR; deploy to AKS (staging/prod)
kiran497 Sep 26, 2025
8e5e4a7
fix: run deploy only on develop/main
kiran497 Sep 26, 2025
705ef5e
chore: remove legacy workflows (aks/*, deploy.yml, ci.yml, release.ym…
kiran497 Sep 26, 2025
2179f45
fix(ci/cd): clean deploy workflows; run only on develop/main
kiran497 Sep 26, 2025
fdbad43
ci: release images to ACR on develop/main
kiran497 Sep 26, 2025
dd2f54c
Merge pull request #1 from kiran497/feature/ci-cd-upgrade
kiran497 Sep 26, 2025
a5890db
fix(deploy): override images to :develop/:main and extend rollout tim…
kiran497 Sep 26, 2025
4a45b22
Merge pull request #2 from kiran497/fix/deploy-image-override
kiran497 Sep 26, 2025
222995d
Resolve conflicts: remove legacy CI/CD workflows; keep develop main.js
kiran497 Sep 26, 2025
8b042bf
Resolve conflicts: final deploy & release workflows, image overrides
kiran497 Sep 26, 2025
fc7a5a4
Resolve conflicts; finalize deploy/release workflows; update frontend…
kiran497 Sep 26, 2025
586a172
Resolve merge conflict in _reusable-ci.yml (unified CI + docker build)
kiran497 Sep 26, 2025
509c93f
Resolve merge conflict in _reusable-ci.yml (unified CI + docker build)
kiran497 Sep 26, 2025
486829b
Resolve conflict in _reusable-ci.yml (unified reusable CI)
kiran497 Sep 26, 2025
a712c16
Task9.2C: staging/prod deployment workflows
kiran497 Sep 26, 2025
f2cab33
Merge branch 'develop' into fix/deploy-image-override-2
kiran497 Sep 26, 2025
67f0c39
Merge pull request #3 from kiran497/fix/deploy-image-override-2
kiran497 Sep 26, 2025
e9ad01a
Update release-images.yml
kiran497 Sep 26, 2025
1493854
Create Dockerfile
kiran497 Sep 26, 2025
ba4b5ee
CI/CD: build backend from Python service; backend svc on 8000
kiran497 Sep 26, 2025
788319c
Backend: simple FastAPI on 8000; fix K8s ports
kiran497 Sep 26, 2025
7b84f3a
Merge branch 'develop' into fix/backend-python
kiran497 Sep 26, 2025
1886a99
Merge pull request #6 from kiran497/fix/backend
kiran497 Sep 26, 2025
af64e45
trigger release images for backend
kiran497 Sep 26, 2025
7845118
chore: trigger staging deploy for evidence
kiran497 Sep 26, 2025
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
93 changes: 93 additions & 0 deletions .github/workflows/_reusable-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: reusable-ci

on:
workflow_call:
inputs:
working-directory:
required: true
type: string
node-version:
type: string
default: '20'
run-tests:
type: boolean
default: true
build-docker:
type: boolean
default: false
image-name:
type: string
default: ''
docker-tag:
type: string
default: ''

jobs:
ci:
name: CI - ${{ inputs.working-directory }}
runs-on: ubuntu-latest
permissions:
contents: read
actions: read
steps:
- uses: actions/checkout@v4

- name: Detect package.json
id: detect
working-directory: ${{ inputs.working-directory }}
run: |
if [ -f package.json ]; then echo "has_pkg=true" >> $GITHUB_OUTPUT; else echo "has_pkg=false" >> $GITHUB_OUTPUT; fi

- if: steps.detect.outputs.has_pkg == 'true'
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: npm
cache-dependency-path: ${{ inputs.working-directory }}/package-lock.json

- if: steps.detect.outputs.has_pkg == 'true'
working-directory: ${{ inputs.working-directory }}
run: |
if [ -f package-lock.json ]; then npm ci; else npm install; fi

- if: steps.detect.outputs.has_pkg == 'true'
working-directory: ${{ inputs.working-directory }}
run: npm run lint --if-present

- if: steps.detect.outputs.has_pkg == 'true' && inputs.run-tests
working-directory: ${{ inputs.working-directory }}
run: npm test --if-present -- --ci

docker:
name: Docker build/publish - ${{ inputs.image-name }}
if: inputs.build-docker
needs: ci
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4

- name: Verify Dockerfile is present
run: |
echo "Expecting: ${{ inputs.working-directory }}/Dockerfile"
ls -la "${{ inputs.working-directory }}"
test -f "${{ inputs.working-directory }}/Dockerfile"

- name: Docker Login
uses: docker/login-action@v3
with:
registry: ${{ secrets.ACR_LOGIN_SERVER }}
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}

- name: Build & push
uses: docker/build-push-action@v5
with:
context: ${{ inputs.working-directory }}
file: ${{ inputs.working-directory }}/Dockerfile
push: true
tags: |
${{ secrets.ACR_LOGIN_SERVER }}/week08/${{ inputs.image-name }}:${{ inputs.docker-tag || github.ref_name }}
${{ secrets.ACR_LOGIN_SERVER }}/week08/${{ inputs.image-name }}:sha-${{ github.sha }}
101 changes: 0 additions & 101 deletions .github/workflows/backend-cd.yml

This file was deleted.

146 changes: 0 additions & 146 deletions .github/workflows/backend_ci.yml

This file was deleted.

28 changes: 28 additions & 0 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: PR CI
on:
pull_request:
branches: [ develop, main ]
paths:
- 'frontend/**'
- 'backend/**'
- '.github/workflows/**'
push:
branches: [ 'feature/**' ]
paths:
- 'frontend/**'
- 'backend/**'

jobs:
frontend:
uses: ./.github/workflows/_reusable-ci.yml
with:
working-directory: frontend
run-tests: true
build-docker: false

backend:
uses: ./.github/workflows/_reusable-ci.yml
with:
working-directory: backend
run-tests: true
build-docker: false
Loading