Compare commits
3 Commits
better-dep
...
668d260fd6
| Author | SHA1 | Date | |
|---|---|---|---|
| 668d260fd6 | |||
| 03dc0984f3 | |||
| 0d94904c50 |
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@@ -18,8 +18,8 @@ jobs:
|
|||||||
run: bun install
|
run: bun install
|
||||||
- name: Build
|
- name: Build
|
||||||
run: bun run build
|
run: bun run build
|
||||||
- name: Write Git-Hash into html
|
- name: Write git hash into dist
|
||||||
run: ./pipeline/create-git-hash-html.sh
|
run: echo "export const GIT_HASH = '$(git rev-parse HEAD)';" > dist/git-hash.js
|
||||||
- name: Create Build Artifact
|
- name: Create Build Artifact
|
||||||
uses: christopherhx/gitea-upload-artifact@v4
|
uses: christopherhx/gitea-upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
@@ -42,7 +42,7 @@ jobs:
|
|||||||
run: biome ci .
|
run: biome ci .
|
||||||
|
|
||||||
create-and-publish-docker-image:
|
create-and-publish-docker-image:
|
||||||
needs: [lint]
|
needs: [build]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -60,6 +60,7 @@ jobs:
|
|||||||
run: docker build -t git.rivercry.com/wg/monitor-im-flur .
|
run: docker build -t git.rivercry.com/wg/monitor-im-flur .
|
||||||
- name: Push Docker image
|
- name: Push Docker image
|
||||||
run: docker push git.rivercry.com/wg/monitor-im-flur
|
run: docker push git.rivercry.com/wg/monitor-im-flur
|
||||||
|
|
||||||
- name: Deploy via SSH
|
- name: Deploy via SSH
|
||||||
uses: appleboy/ssh-action@v0.1.10
|
uses: appleboy/ssh-action@v0.1.10
|
||||||
with:
|
with:
|
||||||
@@ -69,6 +70,7 @@ jobs:
|
|||||||
password: ${{ secrets.GARRISON_DOCKER_PASSWORD }}
|
password: ${{ secrets.GARRISON_DOCKER_PASSWORD }}
|
||||||
script: |
|
script: |
|
||||||
cd monitor-im-flur
|
cd monitor-im-flur
|
||||||
|
export HYPRLAND_INSTANCE_SIGNATURE=$(hyprctl instances -j | jq '.[0].instance' | tr -d "'\"")
|
||||||
hyprctl dispatch exec 'pkill firefox'
|
hyprctl dispatch exec 'pkill firefox'
|
||||||
hyprctl dispatch exec 'firefox -kiosk localhost:9123'
|
hyprctl dispatch exec 'firefox -kiosk localhost:9123'
|
||||||
git clean -dfx
|
git clean -dfx
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
|
FROM oven/bun as builder
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . .
|
||||||
|
RUN bun install
|
||||||
|
RUN bun run build
|
||||||
|
|
||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
COPY ./dist /usr/share/nginx/html
|
COPY --from=builder /app/dist /usr/share/nginx/html
|
||||||
COPY nginx.conf /etc/nginx/nginx.conf
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "Running pre-commit hooks..."
|
|
||||||
|
|
||||||
biome check --write
|
|
||||||
biome lint --write
|
|
||||||
|
|
||||||
if git diff --quiet; then
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
git add -u
|
|
||||||
fi
|
|
||||||
@@ -16,7 +16,7 @@ http {
|
|||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.html /git-hash.js;
|
try_files $uri $uri/ /index.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
|
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
|
||||||
|
|||||||
1
pipeline/build-image.sh
Executable file
1
pipeline/build-image.sh
Executable file
@@ -0,0 +1 @@
|
|||||||
|
#!/bin/bash
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Git Hash</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<pre>GITHUB_SHA = '$GITHUB_SHA';</pre>
|
|
||||||
</body>
|
|
||||||
</html>" > dist/git-hash.html
|
|
||||||
@@ -4,6 +4,7 @@ import imposter from "/img/imposter.png";
|
|||||||
import style from "./style.module.css";
|
import style from "./style.module.css";
|
||||||
|
|
||||||
type Amogus = {
|
type Amogus = {
|
||||||
|
key: string;
|
||||||
isImposter: boolean;
|
isImposter: boolean;
|
||||||
posX: number;
|
posX: number;
|
||||||
posY: number;
|
posY: number;
|
||||||
|
|||||||
Reference in New Issue
Block a user