Compare commits
24 commits
feat/creat
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa9876cb21 | ||
|
|
76d60330ea | ||
|
|
6bc0694776 | ||
|
|
a80ba8d598 | ||
|
|
c1bcfe6023 | ||
|
|
c43f16c5a3 | ||
|
|
65c7db6793 | ||
|
|
c9cff82d2d | ||
|
|
2779bac5da | ||
|
|
b44034c114 | ||
|
|
8ee0f166ae | ||
|
|
cca0087220 | ||
|
|
93559fc358 | ||
|
|
f06db1db91 | ||
|
|
abbb05f02d | ||
|
|
a1df530743 | ||
|
|
031f11c456 | ||
|
|
f675f7d8cc | ||
|
|
6ccfab84ac | ||
|
|
ae6866118b | ||
|
|
46f56682f1 | ||
|
|
5c8eafce99 | ||
|
|
3e92a445ec | ||
|
|
011142dc1a |
5 changed files with 59 additions and 5 deletions
49
.github/workflows/deploy.yml
vendored
Normal file
49
.github/workflows/deploy.yml
vendored
Normal 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
|
||||
4
package-lock.json
generated
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "flowos",
|
||||
"version": "2.3.0",
|
||||
"version": "2.4.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "flowos",
|
||||
"version": "2.3.0",
|
||||
"version": "2.4.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-to-html": "^0.7.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "flowos",
|
||||
"version": "2.3.0",
|
||||
"version": "2.4.0",
|
||||
"description": "The most aesthetic webOS.",
|
||||
"main": "src/bootloader.ts",
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -53,4 +53,4 @@
|
|||
|
||||
<h2>Consent</h2>
|
||||
|
||||
<p>By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.</p>
|
||||
<p>By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.</p>
|
||||
|
|
|
|||
|
|
@ -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.')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue