Replace GitHub actions using deprecated features (#113)

ulyssa · May 29, 2023 · 3a14554 · 3a14554
1 parent 0f87036
commit 3a14554
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,18 +17,16 @@ jobs:
       with:
         submodules: true
     - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@stable
       with:
-          toolchain: stable
           components: clippy
-          override: true
     - name: Check Clippy
-      uses: actions-rs/clippy-check@v1
+      uses: giraffate/clippy-action@v1
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        toolchain: stable
-        args:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        reporter: 'github-check'
   test:
+    needs: clippy_check
     strategy:
       matrix:
         platform: [ubuntu-latest, windows-latest, macos-latest]
@@ -38,12 +36,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: nightly
-          override: true
-          components: rustfmt, clippy
+    - name: Install Rust (1.66)
+      uses: dtolnay/rust-toolchain@1.66
+    - name: Install Rust (nightly w/ rustfmt)
+      run: rustup toolchain install nightly --component rustfmt
     - name: Cache cargo registry
       uses: actions/cache@v3
       with:
@@ -55,19 +51,11 @@ jobs:
         path: target
         key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
     - name: Check formatting
-      uses: actions-rs/cargo@v1
-      with:
-          command: fmt
-          args: --all -- --check
+      run: cargo +nightly fmt --all -- --check
     - name: Run tests
-      uses: actions-rs/cargo@v1
-      with:
-          command: test
+      run: cargo test
     - name: Build artifacts
-      uses: actions-rs/cargo@v1
-      with:
-          command: build
-          args: '--release'
+      run: cargo build --release
     - name: Upload artifacts
       uses: actions/upload-artifact@master
       with:

diff --git a/src/windows/room/chat.rs b/src/windows/room/chat.rs
@@ -489,7 +489,7 @@ impl ChatState {
                         .map_err(IambError::from)?;
                 let mime = mime::IMAGE_PNG;
 
-                let name = Cow::from(format!("Clipboard.png"));
+                let name = "Clipboard.png";
                 let config = AttachmentConfig::new();
 
                 let resp = room