Browse Source

Fehler behoben wegen Pfad und Update GH Actions

hmt 4 years ago
parent
commit
8bf9e5926d
5 changed files with 30 additions and 18 deletions
  1. 2 0
      .github/workflows/build.yml
  2. 8 0
      electron-builder.yml
  3. 12 12
      package-lock.json
  4. 4 4
      package.json
  5. 4 2
      src/database.js

+ 2 - 0
.github/workflows/build.yml

@@ -38,6 +38,8 @@ jobs:
         run: npm run build -m
       - name: Package
         run: npm run dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: show dir
         run: ls dist
       - uses: ncipollo/release-action@v1

+ 8 - 0
electron-builder.yml

@@ -12,6 +12,12 @@ extraMetadata:
 files:
   - ./build/**/*
 
+extraResources:
+- from: "./src/migrations/"
+  to: migrations
+  filter:
+  - "**/*"
+
 win:
   icon: icons/icon.ico
   target: msi
@@ -22,7 +28,9 @@ linux:
   executableName: bangbib
   target:
     - AppImage
+    - rpm
     - snap
+    - deb
 
 mac:
   icon: icons/icon.icns

+ 12 - 12
package-lock.json

@@ -1483,9 +1483,9 @@
       }
     },
     "fsevents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
       "dev": true,
       "optional": true
     },
@@ -2385,9 +2385,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz",
-      "integrity": "sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
       "dev": true
     },
     "prettier-plugin-svelte": {
@@ -2562,9 +2562,9 @@
       }
     },
     "rollup": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz",
-      "integrity": "sha512-1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz",
+      "integrity": "sha512-SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw==",
       "dev": true,
       "requires": {
         "fsevents": "~2.1.2"
@@ -2926,9 +2926,9 @@
       }
     },
     "svelte": {
-      "version": "3.20.1",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.20.1.tgz",
-      "integrity": "sha512-m/dw52BZf+p6KYnyKLErIcGalu4pwJrQbUM7VZriRw6ZlJj1qMAZsLcIWzEB3I0hhdJwkKb7LrrvUIeqmbO92Q=="
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.21.0.tgz",
+      "integrity": "sha512-smh3LZKPCGJ+UXa0iZvUmuDctPYCwPY1opmClTWTm+l6e4y9FHLoCZMiue8YIeyc9JvlGT/EK0xry0diXjFDZQ=="
     },
     "tar": {
       "version": "4.4.10",

+ 4 - 4
package.json

@@ -9,7 +9,7 @@
     "build": "rollup --config",
     "start": "npm run build && run-s start:*",
     "dev": "rollup -c && run-p dev:*",
-    "dist": "electron-builder",
+    "dist": "npm run build && electron-builder -l",
     "start:electron": "electron .",
     "dev:development": "rollup --config --watch",
     "dev:electron": "electron .",
@@ -19,9 +19,9 @@
     "electron": "^8.2.3",
     "electron-builder": "^22.5.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.4",
+    "prettier": "^2.0.5",
     "prettier-plugin-svelte": "^0.7.0",
-    "rollup": "^2.6.1",
+    "rollup": "^2.7.2",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-externals": "^2.1.5",
@@ -35,6 +35,6 @@
     "electron-util": "^0.14.1",
     "ley": "^0.5.0",
     "papaparse": "^5.2.0",
-    "svelte": "^3.20.1"
+    "svelte": "^3.21.0"
   }
 }

+ 4 - 2
src/database.js

@@ -3,12 +3,13 @@ import { ipcRenderer } from "electron";
 import { db } from "./stores.js";
 import { join } from "path";
 import { get } from "svelte/store";
+import ley from 'ley'
+
 const Database = require("better-sqlite3");
-const ley = require("ley");
 
 const userData = api.app.getPath("userData");
 const db_file = join(userData, "datenbank.sqlite");
-const ley_opts = { config: { database: db_file }, dir: "src/migrations" };
+const ley_opts = { config: { database: db_file }, cwd: process.resourcesPath, dir: "migrations" };
 
 export async function db_check() {
   try {
@@ -36,4 +37,5 @@ export async function db_check() {
       console.log("schließe Datenbank…");
     } catch (e) { console.log('Datenbank konnte nicht geschlossen werden: ',e)}
   });
+  console.log(db)
 }