Compare commits
No commits in common. "main" and "0.1.7pre2" have entirely different histories.
|
@ -40,31 +40,29 @@ jobs:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
steps:
|
steps:
|
||||||
- name: Release New Version
|
- name: Release New Version
|
||||||
uses: https://code.forgejo.org/actions/forgejo-release@v1
|
uses: actions/forgejo-release@v1
|
||||||
with:
|
with:
|
||||||
direction: upload
|
direction: upload
|
||||||
url: https://forgejo.neshweb.net
|
url: https://forgejo.neshweb.net
|
||||||
release-dir: release
|
release-dir: release
|
||||||
token: ${{ secrets.FORGEJO_TOKEN }}
|
token: ${{ secrets.FORGEJO_TOKEN }}
|
||||||
tag: ${{ github.ref_name }}
|
tag: ${{ github.ref_name }}
|
||||||
prerelease: true
|
|
||||||
|
|
||||||
# doesn't work atm
|
unlighthouse:
|
||||||
# unlighthouse:
|
needs: [publish]
|
||||||
# needs: [publish]
|
if: success()
|
||||||
# if: success()
|
runs-on: docker
|
||||||
# runs-on: docker
|
container: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest
|
||||||
# container: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest
|
services:
|
||||||
# services:
|
website:
|
||||||
# website:
|
image: forgejo.neshweb.net/firq/firq-dev-website:preview
|
||||||
# image: forgejo.neshweb.net/firq/firq-dev-website:preview
|
steps:
|
||||||
# steps:
|
- name: Install Dependencies
|
||||||
# - name: Install Dependencies
|
run: npm install -g @unlighthouse/cli puppeteer
|
||||||
# run: npm install @unlighthouse/cli puppeteer
|
- name: Run unlighthouse
|
||||||
# - name: Run unlighthouse
|
run: unlighthouse-ci --site website:8081
|
||||||
# run: node_modules/.bin/unlighthouse-ci
|
- name: Upload reports
|
||||||
# - name: Upload reports
|
uses: actions/upload-artifact@v3
|
||||||
# uses: actions/upload-artifact@v3
|
with:
|
||||||
# with:
|
name: unlighthouse-reports
|
||||||
# name: unlighthouse-reports
|
path: unlighthouse-reports/
|
||||||
# path: unlighthouse-reports/
|
|
||||||
|
|
|
@ -2,6 +2,9 @@ on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+'
|
- '[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:
|
jobs:
|
||||||
checking:
|
checking:
|
||||||
|
@ -14,6 +17,7 @@ jobs:
|
||||||
run: npm install
|
run: npm install
|
||||||
- name: Run astro check (linting + static analysis)
|
- name: Run astro check (linting + static analysis)
|
||||||
run: npm run astro check
|
run: npm run astro check
|
||||||
|
run: npm run astro check
|
||||||
|
|
||||||
build-site:
|
build-site:
|
||||||
needs: [checking]
|
needs: [checking]
|
||||||
|
@ -40,7 +44,7 @@ jobs:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
steps:
|
steps:
|
||||||
- name: Release New Version
|
- name: Release New Version
|
||||||
uses: https://code.forgejo.org/actions/forgejo-release@v1
|
uses: actions/forgejo-release@v1
|
||||||
with:
|
with:
|
||||||
direction: upload
|
direction: upload
|
||||||
url: https://forgejo.neshweb.net
|
url: https://forgejo.neshweb.net
|
||||||
|
|
|
@ -1,98 +0,0 @@
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+unlighthouse[0-9]+'
|
|
||||||
- '[0-9]+\.[0-9]+\.[0-9]+ulh[0-9]+'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
unlighthouse:
|
|
||||||
runs-on: docker
|
|
||||||
container: forgejo.neshweb.net/ci-docker-images/unlighthouse:latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: https://code.forgejo.org/actions/checkout@v3
|
|
||||||
- name: Run unlighthouse
|
|
||||||
run: unlighthouse-ci --site "https://preview.firq.dev/"
|
|
||||||
- name: Prepare artifacts
|
|
||||||
run: cp serve.json unlighthouse-reports
|
|
||||||
- name: Upload reports
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: unlighthouse-reports
|
|
||||||
path: unlighthouse-reports/
|
|
||||||
|
|
||||||
deploy-unlighthouse-files:
|
|
||||||
needs: [ unlighthouse ]
|
|
||||||
if: success()
|
|
||||||
runs-on: docker
|
|
||||||
env:
|
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
|
||||||
steps:
|
|
||||||
- name: Install and update ssh + rsync
|
|
||||||
run: |
|
|
||||||
which rsync || ( apt update -y && apt install rsync -y)
|
|
||||||
which ssh-agent || ( apt update -y && apt install openssh-client -y)
|
|
||||||
- name: Downloading static site artifacts
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: unlighthouse-reports
|
|
||||||
path: public
|
|
||||||
- name: Install SSH Key
|
|
||||||
uses: https://github.com/shimataro/ssh-key-action@v2
|
|
||||||
with:
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
known_hosts: unnecessary
|
|
||||||
- name: Adding Known Hosts
|
|
||||||
run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
|
|
||||||
- name: Stop screen session, delete old files
|
|
||||||
uses: https://github.com/appleboy/ssh-action@master
|
|
||||||
with:
|
|
||||||
host: ${{ env.DEPLOY_HOST }}
|
|
||||||
username: ${{ env.DEPLOY_USER }}
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
script: |
|
|
||||||
screen -X -S firq_dev-unlighthouse kill
|
|
||||||
rm -r -f firq_dev/unlighthouse/*
|
|
||||||
- name: Copy files using rsync
|
|
||||||
run: rsync -az --stats public/* ${{ env.DEPLOY_USER }}@${{ env.DEPLOY_HOST }}:~/firq_dev/unlighthouse
|
|
||||||
- name: Check files on deploy target
|
|
||||||
uses: https://github.com/appleboy/ssh-action@master
|
|
||||||
with:
|
|
||||||
host: ${{ env.DEPLOY_HOST }}
|
|
||||||
username: ${{ env.DEPLOY_USER }}
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
script: |
|
|
||||||
cd firq_dev
|
|
||||||
find unlighthouse -maxdepth 1 -printf "%p\n"
|
|
||||||
|
|
||||||
deploy-unlighthouse-site:
|
|
||||||
needs: [ deploy-unlighthouse-files ]
|
|
||||||
if: success()
|
|
||||||
runs-on: docker
|
|
||||||
env:
|
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
|
||||||
steps:
|
|
||||||
- name: Install and update ssh + rsync
|
|
||||||
run: |
|
|
||||||
which rsync || ( apt update -y && apt install rsync -y)
|
|
||||||
which ssh-agent || ( apt update -y && apt install openssh-client -y)
|
|
||||||
- name: Install SSH Key
|
|
||||||
uses: https://github.com/shimataro/ssh-key-action@v2
|
|
||||||
with:
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
known_hosts: unnecessary
|
|
||||||
- name: Adding Known Hosts
|
|
||||||
run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
|
|
||||||
- name: Start new screen session
|
|
||||||
uses: https://github.com/appleboy/ssh-action@master
|
|
||||||
with:
|
|
||||||
host: ${{ env.DEPLOY_HOST }}
|
|
||||||
username: ${{ env.DEPLOY_USER }}
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
script: |
|
|
||||||
PATH="$HOME/.local/bin:$PATH"
|
|
||||||
screen -ls | grep 'firq_dev-unlighthouse' | awk '{print $1}' | xargs -I % -t screen -X -S % quit
|
|
||||||
cd firq_dev
|
|
||||||
screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p ${{ secrets.UNLIGHTHOUSE_DEPLOY_PORT }}
|
|
12
.vscode/settings.json
vendored
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"files.exclude": {
|
|
||||||
"**/.git": true,
|
|
||||||
"**/.svn": true,
|
|
||||||
"**/.hg": true,
|
|
||||||
"**/CVS": true,
|
|
||||||
"**/.DS_Store": true,
|
|
||||||
"**/Thumbs.db": true,
|
|
||||||
"**/__pycache__": true
|
|
||||||
},
|
|
||||||
"hide-files.files": []
|
|
||||||
}
|
|
|
@ -4,11 +4,12 @@ COPY . .
|
||||||
RUN npm i
|
RUN npm i
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM forgejo.neshweb.net/ci-docker-images/website-serve:latest AS runtime
|
FROM node:lts AS runtime
|
||||||
|
RUN npm install --global "@warren-bank/serve"
|
||||||
|
|
||||||
COPY --from=build /app/dist /public
|
COPY --from=build /app/dist /public
|
||||||
COPY --from=build /app/serve.json /public/serve.json
|
COPY --from=build /app/serve.json /public/serve.json
|
||||||
RUN rm -r /public/data/
|
RUN rm -r /public/assets/data/
|
||||||
|
|
||||||
ENV PORT 8081
|
ENV PORT 8081
|
||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { defineConfig } from 'astro/config';
|
import { defineConfig } from 'astro/config';
|
||||||
|
|
||||||
|
// https://astro.build/config
|
||||||
import sitemap from "@astrojs/sitemap";
|
import sitemap from "@astrojs/sitemap";
|
||||||
import mdx from "@astrojs/mdx";
|
|
||||||
|
|
||||||
// https://astro.build/config
|
// https://astro.build/config
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
|
@ -10,5 +10,5 @@ export default defineConfig({
|
||||||
outDir: 'dist',
|
outDir: 'dist',
|
||||||
publicDir: 'static',
|
publicDir: 'static',
|
||||||
site: 'https://firq.dev/',
|
site: 'https://firq.dev/',
|
||||||
integrations: [sitemap(), mdx()]
|
integrations: [sitemap()]
|
||||||
});
|
});
|
4510
package-lock.json
generated
16
package.json
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@firq/fgosite",
|
"name": "@firq/fgosite",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "0.1.27",
|
"version": "0.1.7",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "astro dev",
|
"dev": "astro dev",
|
||||||
|
@ -11,18 +11,10 @@
|
||||||
"astro": "astro"
|
"astro": "astro"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@astro-community/astro-embed-youtube": "^0.4.3",
|
|
||||||
"@astrojs/check": "^0.3.3",
|
"@astrojs/check": "^0.3.3",
|
||||||
"@astrojs/mdx": "^2.0.3",
|
|
||||||
"@astrojs/sitemap": "^3.0.3",
|
"@astrojs/sitemap": "^3.0.3",
|
||||||
"astro": "^4.2.1",
|
"astro": "^4.0.7",
|
||||||
"autoprefixer": "^10.4.16",
|
"iconoir": "^6.1.0",
|
||||||
"iconoir": "^7.2.0",
|
|
||||||
"postcss-preset-env": "^9.3.0",
|
|
||||||
"typescript": "^5.3.3"
|
"typescript": "^5.3.3"
|
||||||
},
|
}
|
||||||
"browserslist": [
|
|
||||||
"last 2 versions",
|
|
||||||
">0.5% and not dead"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
module.exports = {
|
|
||||||
plugins: {
|
|
||||||
"postcss-preset-env": {
|
|
||||||
autoprefixer: { flexbox: "no-2009" },
|
|
||||||
stage: 2,
|
|
||||||
features: {
|
|
||||||
"custom-properties": false,
|
|
||||||
"custom-media-queries": true,
|
|
||||||
"nesting-rules": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
|
@ -14,14 +14,14 @@
|
||||||
"source" : "**/*.css",
|
"source" : "**/*.css",
|
||||||
"headers" : [{
|
"headers" : [{
|
||||||
"key" : "Cache-Control",
|
"key" : "Cache-Control",
|
||||||
"value" : "max-age=31536000"
|
"value" : "max-age=86400"
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
|
"source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
|
||||||
"headers" : [{
|
"headers" : [{
|
||||||
"key" : "Cache-Control",
|
"key" : "Cache-Control",
|
||||||
"value" : "max-age=31536000"
|
"value" : "max-age=86400"
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Before Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 554 KiB |
Before Width: | Height: | Size: 565 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 97 KiB |
Before Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 93 KiB |
Before Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 84 KiB |
Before Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 77 KiB |
Before Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 8.6 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 9.1 KiB |