Merge branch 'hrkfdn:main' into main

hrkfdn · Apr 1, 2023 · ff89434 · ff89434
2 parents 08b9ce2 + 8fe30e3
commit ff89434
Show file tree

Hide file tree

Showing 23 changed files with 1,270 additions and 882 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -49,9 +49,12 @@ jobs:
             features: '--no-default-features --features rodio_backend,pancurses_backend,share_clipboard,notify'
     steps:
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
         with:
+          toolchain: stable
+          override: true
           target: ${{ matrix.target }}
+          profile: minimal
       - name: Install macOS dependencies
         if: matrix.os == 'macos-latest'
         run: brew install portaudio pkg-config
@@ -66,17 +69,19 @@ jobs:
         run: |
           apt update
           apt install -y ${{ matrix.dependencies }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         name: Checkout src
-      - uses: actions/cache@v3
+      - uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/.cargo/registry
+            ~/.cargo/git
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Running cargo build
-        run: cargo build --release --target ${{ matrix.target }} ${{ matrix.features }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --locked --release --target ${{ matrix.target }} ${{ matrix.features }}
       - name: Extract git tag
         shell: bash
         run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF#refs/tags/})"
@@ -86,11 +91,11 @@ jobs:
         run: |
           cd target/${{ matrix.target }}/release
           case ${{ matrix.target }} in
-          *-pc-windows-*)
+          *-pc-windows-*) 
             7z -y a ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.zip ncspot.exe
             sha256sum ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.zip > ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.sha256
             ;;
-          *)
+          *) 
             tar czvf ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.tar.gz ncspot
             shasum -a 256 ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.tar.gz > ncspot-${{ steps.extract_tag.outputs.tag }}-${{ matrix.build_target }}.sha256
             ;;

diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,10 @@ tags
 
 /.vscode/
 
-# Ignore generated manpages
+# Ignore generated resources
 *.1
+misc/_ncspot
+misc/ncspot.bash
+misc/ncspot.fish
+misc/ncspot.elv
+misc/_ncspot.ps1