Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI failures #2263

Merged
merged 2 commits into from
May 17, 2022
Merged

Fix CI failures #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26d5b38
Fix CI failures
Nutomic May 16, 2022
562b88d
Remove youtube metadata test
Nutomic May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ platform:
steps:

- name: prepare repo
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
user: root
commands:
- chown 1000:1000 . -R
- git fetch --tags
- git submodule init
- git submodule update --recursive --remote
- chown 1000:1000 . -R

- name: check formatting
image: rustdocker/rust:nightly
commands:
- /root/.cargo/bin/cargo fmt -- --check

- name: check with different features
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
commands:
# api with minimal deps
- cargo check -p lemmy_api_common
Expand All @@ -33,14 +33,14 @@ steps:
- cargo check

- name: cargo clippy
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
commands:
- rustup component add clippy
- cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
- cargo clippy --workspace -- -D clippy::unwrap_used

- name: cargo test
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
Expand All @@ -52,13 +52,13 @@ steps:
- cargo test --workspace --no-fail-fast

- name: check defaults.hjson updated
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
commands:
- ./scripts/update_config_defaults.sh config/defaults_current.hjson
- diff config/defaults.hjson config/defaults_current.hjson

- name: cargo build
image: clux/muslrust:1.60.0
image: clux/muslrust:1.59.0
commands:
- cargo build
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
Expand Down
10 changes: 0 additions & 10 deletions crates/api_common/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,6 @@ mod tests {
},
sample_res
);

let youtube_url = Url::parse("https://www.youtube.com/watch?v=IquO_TcMZIQ").unwrap();
let youtube_res = fetch_site_metadata(&client, &youtube_url).await.unwrap();
assert_eq!(
SiteMetadata {
title: Some("A Hard Look at Rent and Rent Seeking with Michael Hudson & Pepe Escobar".to_string()),
description: Some("An interactive discussion on wealth inequality and the “Great Game” on the control of natural resources.In this webinar organized jointly by the Henry George...".to_string()),
image: Some(Url::parse("https://i.ytimg.com/vi/IquO_TcMZIQ/maxresdefault.jpg").unwrap()),
html: None,
}, youtube_res);
}

// #[test]
Expand Down