Merge pull request 'develop' (#7) from develop into main

Reviewed-on: Ninjaws/quiz#7
This commit is contained in:
2024-11-07 22:07:11 +00:00
3 changed files with 21 additions and 13 deletions
+3 -12
View File
@@ -1,25 +1,16 @@
name: Quiz App
run-name: ${{ gitea.actor }} is building Quiz App
name: Quiz App Testing
run-name: ${{ gitea.actor }} is testing Quiz App
on: [push]
jobs:
Quiz Runner:
runs-on: bash
steps:
# - name: Ensure bash is installed
# run: |
# sudo apt-get update
# sudo apt-get install bash
- run: apk add docker-compose
- run: docker-compose --version
# - run: apt-get update && \
# apt-get install -y git && \
# apt-get clean && \
# rm -rf /var/lib/apt/lists/*
- run: docker --version
- run: apk add git
- run: apk add nodejs npm
- name: Check out repository code
uses: actions/checkout@v4
- run: docker-compose up -d --build
# - run: apt-get install docker.io
# Run tests
+17
View File
@@ -0,0 +1,17 @@
name: Quiz App Deployment
run-name: ${{ gitea.actor }} is deploying Quiz App
on:
push:
branches:
- main
jobs:
Quiz Runner:
runs-on: bash
steps:
- run: apk add docker-compose
- run: apk add git
- run: apk add nodejs npm
- name: Check out repository code
uses: actions/checkout@v4
- run: docker-compose up -d --build
@@ -1,6 +1,6 @@
<div class="flex items-center justify-center min-h-screen bg-gray-100">
<div class="bg-white p-8 rounded-lg shadow-md w-80">
<h1 class="text-2xl font-bold mb-6 text-center bg-red">Quiz App Update!</h1>
<h1 class="text-2xl font-bold mb-6 text-center bg-red">Quiz App</h1>
<div class="mb-4">
<label for="category" class="block mb-1">Category</label>