Compare commits
No commits in common. "83661b9d3830512ab37701c3d5e5f0294bbdefae" and "c4670958fe25adec7bd1b5df80e57b2f6b79613c" have entirely different histories.
83661b9d38
...
c4670958fe
10 changed files with 3576 additions and 5239 deletions
|
@ -1,67 +0,0 @@
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+pre[0-9]+'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
checking:
|
|
||||||
runs-on: docker
|
|
||||||
container: node:lts
|
|
||||||
steps:
|
|
||||||
- name: Checkout source code
|
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
|
||||||
- name: Install packages
|
|
||||||
run: npm install
|
|
||||||
- name: Run astro check (linting + static analysis)
|
|
||||||
run: npm run astro check
|
|
||||||
|
|
||||||
build-site:
|
|
||||||
needs: [checking]
|
|
||||||
if: success()
|
|
||||||
runs-on: dind
|
|
||||||
steps:
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: forgejo.neshweb.net
|
|
||||||
username: ${{ secrets.FORGEJO_USERNAME }}
|
|
||||||
password: ${{ secrets.FORGEJO_TOKEN }}
|
|
||||||
- name: Push to Package Registry
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
push: true
|
|
||||||
tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:preview
|
|
||||||
|
|
||||||
publish:
|
|
||||||
needs: [build-site]
|
|
||||||
if: success()
|
|
||||||
runs-on: docker
|
|
||||||
steps:
|
|
||||||
- name: Release New Version
|
|
||||||
uses: actions/forgejo-release@v1
|
|
||||||
with:
|
|
||||||
direction: upload
|
|
||||||
url: https://forgejo.neshweb.net
|
|
||||||
release-dir: release
|
|
||||||
token: ${{ secrets.FORGEJO_TOKEN }}
|
|
||||||
tag: ${{ github.ref_name }}
|
|
||||||
|
|
||||||
unlighthouse:
|
|
||||||
needs: [publish]
|
|
||||||
if: success()
|
|
||||||
runs-on: docker
|
|
||||||
services:
|
|
||||||
website:
|
|
||||||
image: forgejo.neshweb.net/firq/firq-dev-website:preview
|
|
||||||
steps:
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: npm install -g @unlighthouse/cli puppeteer
|
|
||||||
- name: Run unlighthouse
|
|
||||||
run: unlighthouse-ci --site website:8081
|
|
||||||
- name: Upload reports
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: unlighthouse-reports
|
|
||||||
path: unlighthouse-reports/
|
|
|
@ -1,53 +0,0 @@
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+'
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+a[0-9]+'
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+b[0-9]+'
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+rc[0-9]+'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
checking:
|
|
||||||
runs-on: docker
|
|
||||||
container: node:lts
|
|
||||||
steps:
|
|
||||||
- name: Checkout source code
|
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
|
||||||
- name: Install packages
|
|
||||||
run: npm install
|
|
||||||
- name: Run astro check (linting + static analysis)
|
|
||||||
run: npm run astro check
|
|
||||||
run: npm run astro check
|
|
||||||
|
|
||||||
build-site:
|
|
||||||
needs: [checking]
|
|
||||||
if: success()
|
|
||||||
runs-on: dind
|
|
||||||
steps:
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: forgejo.neshweb.net
|
|
||||||
username: ${{ secrets.FORGEJO_USERNAME }}
|
|
||||||
password: ${{ secrets.FORGEJO_TOKEN }}
|
|
||||||
- name: Push to Package Registry
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
push: true
|
|
||||||
tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:latest
|
|
||||||
|
|
||||||
release:
|
|
||||||
needs: [build-site]
|
|
||||||
if: success()
|
|
||||||
runs-on: docker
|
|
||||||
steps:
|
|
||||||
- name: Release New Version
|
|
||||||
uses: actions/forgejo-release@v1
|
|
||||||
with:
|
|
||||||
direction: upload
|
|
||||||
url: https://forgejo.neshweb.net
|
|
||||||
release-dir: release
|
|
||||||
token: ${{ secrets.FORGEJO_TOKEN }}
|
|
||||||
tag: ${{ github.ref_name }}
|
|
|
@ -1,16 +0,0 @@
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- "**"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
checking:
|
|
||||||
runs-on: docker
|
|
||||||
container: node:lts
|
|
||||||
steps:
|
|
||||||
- name: Checkout source code
|
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
|
||||||
- name: Install packages
|
|
||||||
run: npm install
|
|
||||||
- name: Run astro check (linting + static analysis)
|
|
||||||
run: npm run astro check
|
|
14
.old.gitlab-ci.yml
Normal file
14
.old.gitlab-ci.yml
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
image: node:lts
|
||||||
|
pages:
|
||||||
|
cache:
|
||||||
|
paths:
|
||||||
|
- node_modules/
|
||||||
|
script:
|
||||||
|
- npm install
|
||||||
|
- npm run build
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- public
|
||||||
|
expire_in: 3 days
|
||||||
|
only:
|
||||||
|
- main
|
17
Dockerfile
17
Dockerfile
|
@ -1,17 +0,0 @@
|
||||||
FROM node:lts AS build
|
|
||||||
WORKDIR /app
|
|
||||||
COPY . .
|
|
||||||
RUN npm i
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
FROM node:lts AS runtime
|
|
||||||
RUN npm install --global "@warren-bank/serve"
|
|
||||||
|
|
||||||
COPY --from=build /app/dist /public
|
|
||||||
COPY --from=build /app/serve.json /public/serve.json
|
|
||||||
RUN rm -r /public/assets/data/
|
|
||||||
|
|
||||||
ENV PORT 8081
|
|
||||||
EXPOSE 8081
|
|
||||||
|
|
||||||
CMD [ "serve", "public/", "-p", "8081" ]
|
|
8624
package-lock.json
generated
8624
package-lock.json
generated
File diff suppressed because it is too large
Load diff
10
package.json
10
package.json
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@firq/fgosite",
|
"name": "@firq/fgosite",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "0.1.7",
|
"version": "0.1.6",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "astro dev",
|
"dev": "astro dev",
|
||||||
|
@ -11,10 +11,8 @@
|
||||||
"astro": "astro"
|
"astro": "astro"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@astrojs/check": "^0.3.3",
|
"@astrojs/sitemap": "^1.2.1",
|
||||||
"@astrojs/sitemap": "^3.0.3",
|
"astro": "^2.8.0",
|
||||||
"astro": "^4.0.7",
|
"iconoir": "^6.1.0"
|
||||||
"iconoir": "^6.1.0",
|
|
||||||
"typescript": "^5.3.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,20 +42,18 @@ const fulllink = `/${slug}`
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
li > a {
|
li > a {
|
||||||
display: inline-flex;
|
|
||||||
color: white;
|
color: white;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: flex-end;
|
align-items: center;
|
||||||
font-size: 1.4em;
|
font-size: 1.4em;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
gap: 0.2em;
|
|
||||||
}
|
}
|
||||||
li > a:hover {
|
li > a:hover {
|
||||||
color: var(--c-purplepink);
|
color: var(--c-purplepink);
|
||||||
}
|
}
|
||||||
.current {
|
.current {
|
||||||
color: var(--c-darkpurple) !important;
|
color: var(--c-darkpurple);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
{
|
{
|
||||||
"link": "/",
|
"link": "/",
|
||||||
"text": "Home",
|
"text": "Home",
|
||||||
"icon": "iconoir-home"
|
"icon": "iconoir-home-alt"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"link": "/servants",
|
"link": "/servants",
|
||||||
"text": "Servants",
|
"text": "Servants",
|
||||||
"icon": "iconoir-task-list"
|
"icon": "iconoir-database-script"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"link": "/ta-collection",
|
"link": "/ta-collection",
|
||||||
"text": "TA Collection",
|
"text": "TA Collection",
|
||||||
"icon": "iconoir-database"
|
"icon": "iconoir-db"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"link": "/blog",
|
"link": "/blog",
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
export default {
|
export default {
|
||||||
|
site: 'staging.firq.dev',
|
||||||
puppeteerOptions: {
|
puppeteerOptions: {
|
||||||
args: ["--no-sandbox", "--disable-setuid-sandbox"],
|
args: ["--no-sandbox", "--disable-setuid-sandbox"],
|
||||||
},
|
},
|
||||||
|
@ -6,5 +7,6 @@ export default {
|
||||||
budget: 90,
|
budget: 90,
|
||||||
buildStatic: true
|
buildStatic: true
|
||||||
},
|
},
|
||||||
|
auth: { username: "staging", password: "staging" },
|
||||||
outputPath: "unlighthouse-reports",
|
outputPath: "unlighthouse-reports",
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue