Compare commits

..

No commits in common. "master" and "v1.2.0" have entirely different histories.

4 changed files with 8 additions and 15 deletions

View File

@ -9,9 +9,7 @@ steps:
- name: build - name: build
path: /build path: /build
commands: commands:
- export VERSION="1.2.5" - echo "v1.2.0" > /build/version.txt
- echo $VERSION > /build/version.txt
- echo "v$VERSION" > /build/release-version.txt
- npm install - npm install
- npm run build - npm run build
- cp -R dist /build/dist - cp -R dist /build/dist
@ -33,9 +31,9 @@ steps:
path: /build path: /build
settings: settings:
gitea_server: https://git.meow.tf gitea_server: https://git.meow.tf
tag_file: /build/release-version.txt tag_file: /build/version.txt
title_file: /build/release-version.txt title_file: /build/version.txt
files: [ '/build/*.tgz', '/build/*.deb' ] files: [ '/build/*' ]
environment: environment:
PLUGIN_API_KEY: PLUGIN_API_KEY:
from_secret: gitea_token from_secret: gitea_token

View File

@ -4,6 +4,7 @@ fpm -s dir -t deb -p /build/arm-web_$VERSION.deb \
--deb-compression bzip2 \ --deb-compression bzip2 \
--description "Automatic Ripping Machine Web Interface" \ --description "Automatic Ripping Machine Web Interface" \
-m "cats <admin@meow.tf>" --vendor "Meow.tf" \ -m "cats <admin@meow.tf>" --vendor "Meow.tf" \
--depends nginx \
--url "https://meow.tf" \ --url "https://meow.tf" \
packaging/arm.conf=/etc/nginx/conf.d/arm.conf \ packaging/arm.conf=/etc/nginx/conf.d/arm.conf \
/build/dist/=/var/lib/arm/web/ /build/dist=/var/lib/arm/web

View File

@ -48,8 +48,7 @@ ws.on('jobs', function(data) {
ws.on('job:create', function(job) { ws.on('job:create', function(job) {
// Create new job component // Create new job component
d.jobs[job.id] = job; Vue.set(d.jobs, job.id, job);
Vue.set(d, 'jobs', d.jobs);
}); });
ws.on('job:update', function(update) { ws.on('job:update', function(update) {
@ -62,11 +61,6 @@ ws.on('job:update', function(update) {
} }
}); });
ws.on('job:complete', function(job) {
delete d.jobs[job.id];
Vue.set(d, 'jobs', d.jobs);
});
ws.on('job:progress', function(progress) { ws.on('job:progress', function(progress) {
// Update component status bar for progress.job_id // Update component status bar for progress.job_id
let job = d.jobs[progress.job_id]; let job = d.jobs[progress.job_id];

View File

@ -2,7 +2,7 @@
<b-nav-item-dropdown no-caret right> <b-nav-item-dropdown no-caret right>
<template slot="button-content"> <template slot="button-content">
<font-awesome-icon icon="tachometer-alt" /> CPU <font-awesome-icon icon="tachometer-alt" /> CPU
<b-progress :value="status" height=".5rem" :variant="percentageClass"></b-progress> <b-progress :value="status.UserPct" height=".5rem" :variant="percentageClass"></b-progress>
</template> </template>
<b-dropdown-header class="text-center">CPU</b-dropdown-header> <b-dropdown-header class="text-center">CPU</b-dropdown-header>
<div class="text-center"> <div class="text-center">