Skip to content

Commit ee92040

Browse files
authored
Merge branch 'qa' into deployment
2 parents 2bb92f4 + a686bb6 commit ee92040

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1874
-602
lines changed

.github/workflows/docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: docker/build-push-action@v5
3636
with:
3737
context: ${{ matrix.component }}
38-
push: ${{ github.event_name != 'pull_request' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/qa' ) }}
38+
push: ${{ github.event_name != 'pull_request' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/qa' ) }}
3939
platforms: linux/amd64
4040
file: ${{ matrix.component }}/Dockerfile
4141
tags: |
@@ -49,7 +49,7 @@ jobs:
4949
concurrency: prod
5050
environment:
5151
name: prod
52-
if: ${{ github.event_name != 'pull_request' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/qa' ) }}
52+
if: ${{ github.event_name != 'pull_request' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/qa' ) }}
5353
steps:
5454
- name: Checkout repository
5555
uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
6464
env:
6565
BRANCH: ${{ github.ref }}
6666
run: |
67-
if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
67+
if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
6868
echo "TYPE=prod" >> $GITHUB_OUTPUT
6969
elif [[ "${{ github.ref }}" == "refs/heads/qa" ]]; then
7070
echo "TYPE=qa" >> $GITHUB_OUTPUT
@@ -84,4 +84,4 @@ jobs:
8484
git commit -m "feat(website/${{ steps.get_manifest.outputs.TYPE }}): update image"
8585
git push -u origin update/website-${{ steps.get_manifest.outputs.TYPE }}/${{ github.sha }}
8686
gh pr create -B develop --title "feat(website/${{ steps.get_manifest.outputs.TYPE }}): update image" --body "Updates the image for the website-prod deployment to commit csesoc/csesoc-website@${{ github.sha }}." > URL
87-
gh pr merge $(cat URL) --squash -d
87+
gh pr merge $(cat URL) --squash -d

frontend/components.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": false,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "tailwind.config.ts",
8+
"css": "src/styles/globals.css",
9+
"baseColor": "neutral",
10+
"cssVariables": true,
11+
"prefix": ""
12+
},
13+
"aliases": {
14+
"components": "@/components",
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib",
18+
"hooks": "@/hooks"
19+
},
20+
"iconLibrary": "lucide"
21+
}

0 commit comments

Comments
 (0)