Skip to content

Commit

Permalink
Replace GitHub actions using deprecated features (#114)
Browse files Browse the repository at this point in the history
  • Loading branch information
ulyssa committed May 29, 2023
1 parent 0f87036 commit 32abe1c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 35 deletions.
48 changes: 14 additions & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,8 @@ on:
name: CI

jobs:
clippy_check:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: true
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
override: true
- name: Check Clippy
uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
toolchain: stable
args:
test:
needs: clippy_check
strategy:
matrix:
platform: [ubuntu-latest, windows-latest, macos-latest]
Expand All @@ -38,12 +20,12 @@ jobs:
uses: actions/checkout@v3
with:
submodules: true
- name: Install Rust
uses: actions-rs/toolchain@v1
- name: Install Rust (1.66 w/ clippy)
uses: dtolnay/rust-toolchain@1.66
with:
toolchain: nightly
override: true
components: rustfmt, clippy
components: clippy
- name: Install Rust (nightly w/ rustfmt)
run: rustup toolchain install nightly --component rustfmt
- name: Cache cargo registry
uses: actions/cache@v3
with:
Expand All @@ -55,19 +37,17 @@ jobs:
path: target
key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
- name: Check formatting
uses: actions-rs/cargo@v1
run: cargo +nightly fmt --all -- --check
- name: Check Clippy
if: matrix.os == 'ubuntu-latest'
uses: giraffate/clippy-action@v1
with:
command: fmt
args: --all -- --check
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: 'github-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:
Expand Down
2 changes: 1 addition & 1 deletion src/windows/room/chat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 32abe1c

Please sign in to comment.