Compare commits

..

8 commits

Author SHA1 Message Date
ThinLiquid
fa9876cb21
Update bootloader.ts 2024-03-30 12:01:33 +00:00
ThinLiquid
76d60330ea
Update bootloader.ts 2024-03-30 11:59:55 +00:00
ThinLiquid
6bc0694776
Update bootloader.ts 2024-03-30 11:55:05 +00:00
ThinLiquid
a80ba8d598
Update deploy.yml 2024-02-14 18:26:27 +00:00
ThinLiquid
c1bcfe6023
Update deploy.yml 2024-02-14 18:15:16 +00:00
ThinLiquid
c43f16c5a3
Update and rename main.yml to deploy.yml 2024-02-14 18:11:15 +00:00
ThinLiquid
65c7db6793
Rename deploy.yml to main.yml 2024-02-14 18:09:36 +00:00
ThinLiquid
c9cff82d2d
Create deploy.yml 2024-02-14 18:08:24 +00:00
4 changed files with 60 additions and 6 deletions

49
.github/workflows/deploy.yml vendored Normal file
View file

@ -0,0 +1,49 @@
name: Deploy
on:
push:
branches:
- master
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
- name: Install dependencies
uses: bahmutov/npm-install@v1
- name: Build project
run: npx vite build --base="/FlowOS/"
- name: Upload production-ready build files
uses: actions/upload-artifact@v3
with:
name: production-files
path: ./dist
deploy:
name: Deploy
needs: build
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: production-files
path: ./dist
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist

8
package-lock.json generated
View file

@ -14,7 +14,7 @@
"eruda": "^3.0.1",
"js-ini": "^1.6.0",
"material-symbols": "^0.14.3",
"prism-code-editor": "^2.4.1",
"prism-code-editor": "^2.3.0",
"semver": "^7.5.4",
"uuid": "^9.0.1"
},
@ -9929,9 +9929,9 @@
}
},
"node_modules/prism-code-editor": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/prism-code-editor/-/prism-code-editor-2.4.1.tgz",
"integrity": "sha512-ifz8BQhBz1q0eRe1rr4DwQ37y+MCT069n9Rohc4TGTyhfrx5BW4OxvgwjgFeU1ZWhM9pczxYQva4B1z9DBVT6Q==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/prism-code-editor/-/prism-code-editor-2.4.0.tgz",
"integrity": "sha512-+i/RM6YvGOQ4tztOATbaktf4xm0ESY+hsIkweMfKVuiydeyul3jS9JYtpvQzEV2Uz2lkWBLidn3aAvoJj5a4hg==",
"dependencies": {
"@types/prismjs": "^1.26.2"
}

View file

@ -39,7 +39,7 @@
"eruda": "^3.0.1",
"js-ini": "^1.6.0",
"material-symbols": "^0.14.3",
"prism-code-editor": "^2.4.1",
"prism-code-editor": "^2.3.0",
"semver": "^7.5.4",
"uuid": "^9.0.1"
},

View file

@ -116,7 +116,12 @@ window.console.group = (...args: any) => {
try {
const args = new URLSearchParams(window.location.search)
const kernel = new Kernel()
await kernel.boot(boot, progress, args)
writeln('/-----------------------------------------------\\')
writeln('| FlowOS is now discontinued. Starting in 10s...|')
writeln('\\-----------------------------------------------/')
setTimeout(() => {
kernel.boot(boot, progress, args).catch(e => console.error(e))
}, 10000)
} catch (e) {
writeln()
writeln('An error occured while booting FlowOS.')