grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2263 from LemmyNet/fix-ci-unsafe-repo

Browse source 
Fix CI failures
This commit is contained in:
Dessalines 2022-05-17 13:44:09 -04:00 committed by GitHub
commit 144336b8b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.drone.yml
View file

@ -9,13 +9,13 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
user: root user: root
commands: commands:
- chown 1000:1000 . -R
- git fetch --tags - git fetch --tags
- git submodule init - git submodule init
- git submodule update --recursive --remote - git submodule update --recursive --remote
- chown 1000:1000 . -R
- name: check formatting - name: check formatting
image: rustdocker/rust:nightly image: rustdocker/rust:nightly
@ -23,7 +23,7 @@ steps:
- /root/.cargo/bin/cargo fmt -- --check - /root/.cargo/bin/cargo fmt -- --check
- name: check with different features - name: check with different features
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
commands: commands:
# api with minimal deps # api with minimal deps
- cargo check -p lemmy_api_common - cargo check -p lemmy_api_common
@ -33,14 +33,14 @@ steps:
- cargo check - cargo check
- name: cargo clippy - name: cargo clippy
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
commands: commands:
- rustup component add clippy - 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 --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 - cargo clippy --workspace -- -D clippy::unwrap_used
- name: cargo test - name: cargo test
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@ -52,13 +52,13 @@ steps:
- cargo test --workspace --no-fail-fast - cargo test --workspace --no-fail-fast
- name: check defaults.hjson updated - name: check defaults.hjson updated
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
commands: commands:
- ./scripts/update_config_defaults.sh config/defaults_current.hjson - ./scripts/update_config_defaults.sh config/defaults_current.hjson
- diff config/defaults.hjson config/defaults_current.hjson - diff config/defaults.hjson config/defaults_current.hjson
- name: cargo build - name: cargo build
image: clux/muslrust:1.60.0 image: clux/muslrust:1.59.0
commands: commands:
- cargo build - cargo build
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server

10
crates/api_common/src/request.rs
View file

@ -252,16 +252,6 @@ mod tests {
}, },
sample_res 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] // #[test]