Skip to content

Commit c907268

Browse files
pavanputtipavanputti
committed
Resolved merge conflicts by restoring files from development
1 parent 6a00259 commit c907268

4 files changed

Lines changed: 1933 additions & 3083 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
name: Build and Deploy
2-
on:
3-
push:
4-
branches:
5-
- main
6-
- development
7-
concurrency:
8-
group: Build and Deploy / ${{ github.ref_name == 'main' && 'Production' || 'Development' }}
9-
cancel-in-progress: true
10-
jobs:
11-
# Build
12-
build:
13-
name: Build
14-
strategy:
15-
matrix:
16-
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
17-
environment: ${{ matrix.environment }}
18-
runs-on: ubuntu-latest
19-
steps:
20-
- name: Checkout Repository
21-
uses: actions/checkout@v4
22-
- name: Setup Node.js
23-
uses: actions/setup-node@v4
24-
with:
25-
node-version: 20
26-
cache: 'yarn'
27-
- name: Install Dependencies
28-
run: yarn install --frozen-lockfile
29-
# We don't run tests here since we assume it's already done during PR process.
30-
# - name: Update Browser List
31-
# run: npx browserslist@latest --update-db
32-
- name: Build React App
33-
run: yarn run build && cp build/index.html build/200.html
34-
env:
35-
NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
36-
REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}
37-
GENERATE_SOURCEMAP: ${{ github.ref_name != 'main' }}
38-
- name: Upload Build Artifact
39-
uses: actions/upload-artifact@v4
40-
with:
41-
name: ${{ matrix.environment }} Build
42-
path: ./build
43-
# Deployment
44-
deployment-surge:
45-
name: Deploy to Surge
46-
needs: build
47-
runs-on: ubuntu-latest
48-
strategy:
49-
matrix:
50-
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
51-
environment: ${{ matrix.environment }}
52-
if: ${{ success() }}
53-
steps:
54-
- name: Download Build Artifact
55-
uses: actions/download-artifact@v4
56-
with:
57-
name: ${{ matrix.environment }} Build
58-
path: ./build
59-
- name: Deploy to Surge
60-
uses: dswistowski/surge-sh-action@v1
61-
with:
62-
domain: ${{ vars.SURGE_DOMAIN }}
63-
project: './build'
64-
login: ${{ secrets.SURGE_LOGIN }}
65-
token: ${{ secrets.SURGE_TOKEN }}
1+
name: Build and Deploy
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- development
7+
concurrency:
8+
group: Build and Deploy / ${{ github.ref_name == 'main' && 'Production' || 'Development' }}
9+
cancel-in-progress: true
10+
jobs:
11+
# Build
12+
build:
13+
name: Build
14+
strategy:
15+
matrix:
16+
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
17+
environment: ${{ matrix.environment }}
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout Repository
21+
uses: actions/checkout@v4
22+
- name: Setup Node.js
23+
uses: actions/setup-node@v4
24+
with:
25+
node-version: 20
26+
cache: 'yarn'
27+
- name: Install Dependencies
28+
run: yarn install --frozen-lockfile
29+
# We don't run tests here since we assume it's already done during PR process.
30+
# - name: Update Browser List
31+
# run: npx browserslist@latest --update-db
32+
- name: Build React App
33+
run: yarn run build && cp build/index.html build/200.html
34+
env:
35+
NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
36+
REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}
37+
GENERATE_SOURCEMAP: ${{ github.ref_name != 'main' }}
38+
- name: Upload Build Artifact
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: ${{ matrix.environment }} Build
42+
path: ./build
43+
# Deployment
44+
deployment-surge:
45+
name: Deploy to Surge
46+
needs: build
47+
runs-on: ubuntu-latest
48+
strategy:
49+
matrix:
50+
environment: ${{ github.ref_name == 'main' && fromJson('["Production", "Beta"]') || fromJson('["Development"]') }}
51+
environment: ${{ matrix.environment }}
52+
if: ${{ success() }}
53+
steps:
54+
- name: Download Build Artifact
55+
uses: actions/download-artifact@v4
56+
with:
57+
name: ${{ matrix.environment }} Build
58+
path: ./build
59+
- name: Deploy to Surge
60+
uses: dswistowski/surge-sh-action@v1
61+
with:
62+
domain: ${{ vars.SURGE_DOMAIN }}
63+
project: './build'
64+
login: ${{ secrets.SURGE_LOGIN }}
65+
token: ${{ secrets.SURGE_TOKEN }}

‎.github/workflows/pull_request_test.yml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
name: Pull Request Unit Test
2-
3-
on:
4-
pull_request:
5-
branches:
6-
- development
7-
jobs:
8-
# CSS Enforcement
9-
css-check:
10-
name: Enforce CSS Modules
11-
runs-on: ubuntu-latest
12-
steps:
13-
- name: Checkout Repository
14-
uses: actions/checkout@v4
15-
with:
16-
fetch-depth: 0
17-
18-
- name: Check for disallowed .css files in changed files
19-
run: |
20-
# Get list of changed CSS files in this PR
21-
changed_files=$(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD | grep '\.css$' || true)
22-
23-
if [ -z "$changed_files" ]; then
24-
echo "No CSS files changed in this PR"
25-
exit 0
26-
fi
27-
28-
echo "Changed CSS files:"
29-
echo "$changed_files"
30-
31-
# Check if any of the changed files are disallowed
32-
disallowed=$(echo "$changed_files" | grep -vE '(\.module\.css$|index\.css$)' || true)
33-
34-
if [ -n "$disallowed" ]; then
35-
echo "❌ Disallowed CSS file detected! Only '.module.css' (or 'index.css') files are permitted."
36-
echo "The following files violate the CSS Module policy:"
37-
echo "$disallowed"
38-
exit 1
39-
else
40-
echo "✅ CSS Module Enforcement Check passed - all changed CSS files are valid"
41-
fi
42-
43-
test:
44-
runs-on: ubuntu-latest
45-
steps:
46-
- uses: actions/checkout@v4
47-
with:
48-
fetch-depth: 0
49-
- uses: actions/setup-node@v4
50-
with:
51-
node-version: 20
52-
cache: 'yarn'
53-
- name: Install Dependencies
54-
run: yarn install --frozen-lockfile
55-
- name: Run Unit Tests for Changed Files Only
56-
run: yarn run test:changed
57-
- name: Run Lint
58-
run: yarn run lint
1+
name: Pull Request Unit Test
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- development
7+
jobs:
8+
# CSS Enforcement
9+
css-check:
10+
name: Enforce CSS Modules
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout Repository
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Check for disallowed .css files in changed files
19+
run: |
20+
# Get list of changed CSS files in this PR
21+
changed_files=$(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD | grep '\.css$' || true)
22+
23+
if [ -z "$changed_files" ]; then
24+
echo "No CSS files changed in this PR"
25+
exit 0
26+
fi
27+
28+
echo "Changed CSS files:"
29+
echo "$changed_files"
30+
31+
# Check if any of the changed files are disallowed
32+
disallowed=$(echo "$changed_files" | grep -vE '(\.module\.css$|index\.css$)' || true)
33+
34+
if [ -n "$disallowed" ]; then
35+
echo "❌ Disallowed CSS file detected! Only '.module.css' (or 'index.css') files are permitted."
36+
echo "The following files violate the CSS Module policy:"
37+
echo "$disallowed"
38+
exit 1
39+
else
40+
echo "✅ CSS Module Enforcement Check passed - all changed CSS files are valid"
41+
fi
42+
43+
test:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: actions/checkout@v4
47+
with:
48+
fetch-depth: 0
49+
- uses: actions/setup-node@v4
50+
with:
51+
node-version: 20
52+
cache: 'yarn'
53+
- name: Install Dependencies
54+
run: yarn install --frozen-lockfile
55+
- name: Run Unit Tests for Changed Files Only
56+
run: yarn run test:changed
57+
- name: Run Lint
58+
run: yarn run lint

0 commit comments

Comments
 (0)