Skip to content

Commit

Permalink
Merge pull request #503 from xou816/development
Browse files Browse the repository at this point in the history
0.3.2
  • Loading branch information
xou816 authored Mar 27, 2022
2 parents b3a4d95 + cd8d2c4 commit 5b0e737
Show file tree
Hide file tree
Showing 138 changed files with 10,001 additions and 5,075 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/spot-development.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .github/workflows/spot-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"options": {
"env": {
"RUST_BACKTRACE": "1",
"RUST_LOG": "info",
"RUST_LOG": "spot=debug",
//"https_proxy": "localhost:8080"
}
},
Expand Down
2 changes: 2 additions & 0 deletions ARTISTS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Tobias Bernard
Noëlle
4 changes: 3 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ Nils Tonnätt
Niklas Sauter
Nicolas Fella
Fridolin Weisser
Jan Przebor
Jan Przebor
Warren Hu
bbb651
Loading

0 comments on commit 5b0e737

Please sign in to comment.