Merge pull request #503 from xou816/development

0.3.2
xou816 · Mar 27, 2022 · 5b0e737 · 5b0e737
2 parents b3a4d95 + cd8d2c4
commit 5b0e737
Show file tree

Hide file tree

Showing 138 changed files with 10,001 additions and 5,075 deletions.
diff --git a/.github/workflows/spot-development.yml b/.github/workflows/spot-development.yml
@@ -0,0 +1,22 @@
+name: spot-development
+
+on:
+ pull_request:
+ branches: [development]
+ workflow_dispatch:
+
+jobs:
+ flatpak-builder:
+ name: "Flatpak Builder"
+ runs-on: ubuntu-latest
+ container:
+ image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+ options: --privileged
+ steps:
+ - uses: actions/checkout@v2
+ - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+ with:
+ bundle: "spot.flatpak"
+ manifest-path: "dev.alextren.Spot.development.json"
+ cache-key: flatpak-builder-${{ github.sha }}
+ run-tests: true
diff --git a/.github/workflows/spot-snapshots.yml b/.github/workflows/spot-snapshots.yml
@@ -2,9 +2,9 @@ name: spot-snapshots
 
 on:
  push:
- branches: [master, gtk4/main]
+ branches: [master]
  pull_request:
- branches: [master, gtk4/main]
+ branches: [master]
  workflow_dispatch:
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
  options: --privileged
  steps:
  - uses: actions/checkout@v2
- - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+ - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
  with:
  bundle: "spot.flatpak"
  manifest-path: "dev.alextren.Spot.snapshots.json"

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,7 +5,7 @@
  "options": {
  "env": {
  "RUST_BACKTRACE": "1",
- "RUST_LOG": "info",
+ "RUST_LOG": "spot=debug",
  //"https_proxy": "localhost:8080"
  }
  },

diff --git a/ARTISTS b/ARTISTS
@@ -0,0 +1,2 @@
+Tobias Bernard
+Noëlle
diff --git a/AUTHORS b/AUTHORS
@@ -14,4 +14,6 @@ Nils Tonnätt
 Niklas Sauter
 Nicolas Fella
 Fridolin Weisser
-Jan Przebor
+Jan Przebor
+Warren Hu
+bbb651