Skip to content
Snippets Groups Projects
Commit 4300a7ec authored by Wakefield, Rob's avatar Wakefield, Rob
Browse files

Merge branch 'master' into 'production'

Master

See merge request !15
parents 73a7a89d 64ccc609
No related branches found
No related tags found
4 merge requests!53Cv upload,!49Master,!35Create pages from mockups and link with Prisma,!15Master
Pipeline #419847 passed
......@@ -18,26 +18,26 @@ build-job: # This job runs in the build stage, which runs first.
- npm run build
- chmod u+x node_modules
tags:
- prod-runner # Use the runner with correct tag to run this pipeline
- build-runner # Use the runner with correct tag to run this pipeline
unit-test-job: # This job runs in the test stage.
stage: test # It only starts when the job in the build stage completes successfully.
script:
- echo "Running unit tests..."
tags:
- prod-runner # Use the runner with correct tag to run this pipeline
- test-runner # Use the runner with correct tag to run this pipeline
deploy-job: # This job runs in the deploy stage.
stage: deploy # It only runs when *all* jobs in the test stage complete successfully.
environment: production
script:
- export PORT=80
- touch ./next.log
- export PORT=80
- sudo fuser -k $PORT/tcp || true # Kill any process running on $PORT
- sudo npm run start $PORT > ./next.log 2>&1 & # Run the web app
artifacts:
paths:
- next.log # Keep output from deploy as artifact
tags:
- prod-runner # Use the runner with correct tag to run this pipeline
- deploy-runner # Use the runner with correct tag to run this pipeline
......@@ -11,7 +11,7 @@ function studentDashboard() {
<main className="studentDashboard">
<Nav fill className="justify-content-center" activeKey="/home">
<Nav.Item>
<h6>3 Requirement Matched </h6>
<h6>3 Requirements Matched </h6>
</Nav.Item>
<Nav.Item>
<h4>Your Application </h4>
......@@ -53,4 +53,4 @@ function studentDashboard() {
);
}
export default studentDashboard;
\ No newline at end of file
export default studentDashboard;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment