Skip to content

Commit e0bb637

Browse files
Merge pull request #23 from ossdaiict/aditya/feature
feat:deployment issue fixed
2 parents ac21f8a + f41000a commit e0bb637

File tree

2 files changed

+48
-9
lines changed

2 files changed

+48
-9
lines changed

.github/workflows/deploy.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,20 @@ name: Deploy to GitHub Pages
22

33
on:
44
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
5+
branches: [ main, master ]
6+
workflow_dispatch:
7+
8+
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
15+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
16+
concurrency:
17+
group: "pages"
18+
cancel-in-progress: false
819

920
jobs:
1021
build-and-deploy:
@@ -31,9 +42,14 @@ jobs:
3142
cd Slot-Booking-System-Frontend
3243
npm run build
3344
34-
- name: Deploy to GitHub Pages
35-
uses: peaceiris/actions-gh-pages@v3
36-
if: github.ref == 'refs/heads/main'
45+
- name: Setup Pages
46+
uses: actions/configure-pages@v4
47+
48+
- name: Upload artifact
49+
uses: actions/upload-pages-artifact@v3
3750
with:
38-
github_token: ${{ secrets.GITHUB_TOKEN }}
39-
publish_dir: ./Slot-Booking-System-Frontend/dist
51+
path: './Slot-Booking-System-Frontend/dist'
52+
53+
- name: Deploy to GitHub Pages
54+
id: deployment
55+
uses: actions/deploy-pages@v4

package.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
{
2+
"name": "slot-booking-system-monorepo",
3+
"version": "1.0.0",
4+
"description": "A comprehensive full-stack web application for managing event slot bookings",
5+
"homepage": "https://ossdaiict.github.io/SLoP5.0-Slot-Booking-System/",
6+
"scripts": {
7+
"install-frontend": "cd Slot-Booking-System-Frontend && npm install",
8+
"install-backend": "cd Slot-Booking-System-Backend && npm install",
9+
"build": "cd Slot-Booking-System-Frontend && npm run build",
10+
"dev-frontend": "cd Slot-Booking-System-Frontend && npm run dev",
11+
"dev-backend": "cd Slot-Booking-System-Backend && npm run dev",
12+
"predeploy": "npm run build",
13+
"deploy": "cd Slot-Booking-System-Frontend && npm run deploy"
14+
},
215
"dependencies": {
316
"@headlessui/react": "^2.2.9",
417
"@heroicons/react": "^2.2.0"
5-
}
18+
},
19+
"devDependencies": {
20+
"gh-pages": "^6.3.0"
21+
},
22+
"repository": {
23+
"type": "git",
24+
"url": "https://github.com/ossdaiict/SLoP5.0-Slot-Booking-System.git"
25+
},
26+
"keywords": ["slot-booking", "react", "nodejs", "mongodb", "university"],
27+
"author": "OSSD DAIICT",
28+
"license": "MIT"
629
}

0 commit comments

Comments
 (0)