Compare commits

..

No commits in common. "9e6815aa31603c45772938a6b4e4f07a89633ed8" and "b927385d25154885ba6ab011c6c8cb4cc875e63b" have entirely different histories.

3 changed files with 1 additions and 61 deletions

54
Jenkinsfile vendored
View File

@ -1,54 +0,0 @@
pipeline {
agent any
options {
buildDiscarder(logRotator(numToKeepStr: "100"))
skipDefaultCheckout(true)
}
triggers {
pollSCM("*/10 * * * *")
}
environment {
SONAR_SCANNER_VERSION="4.7.0.2747"
SONAR_SCANNER_HOME="$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux"
PATH="$SONAR_SCANNER_HOME/bin:$PATH"
SONAR_SCANNER_OPTS="-server"
}
stages {
stage('Checkout') {
steps{
//cleanWs()
checkout scm
}
}
/*stage('Clean') {
steps {
withEnv(["PATH+RUST=$HOME/.cargo/bin"]) { // Cargo needs to be installed for the jenkins user
sh 'cargo clean'
}
}
}*/
stage('Build') {
steps {
withSonarQubeEnv(installationName: 'SQ Bib Watcher', envOnly: true) {
withEnv(["PATH+RUST=$HOME/.cargo/bin"]) {
sh 'cargo build --release'
}
}
}
}
// For this to work, edit sonar-scanner script to set use_embedded_jre=false
stage('SonarQube Analysis') {
steps {
withSonarQubeEnv(installationName: 'SQ Bib Watcher', envOnly: true) {
withEnv(["PATH+RUST=$HOME/.cargo/bin"]) {
sh """
SONAR_TOKEN="$SONAR_AUTH_TOKEN"
cargo clippy --message-format=json &> clippy-output.json
sonar-scanner -Dsonar.projectKey=bib-watcher -Dsonar.sources=. -Dsonar.host.url=http://grover.local:9000
"""
}
}
}
}
}
}

View File

@ -1 +0,0 @@
community.rust.clippy.reportPaths=clippy-output.json

View File

@ -1,6 +1,6 @@
use config::Config; use config::Config;
use reqwest::header; use reqwest::header;
use rss::{Channel, ChannelBuilder, GuidBuilder, ItemBuilder}; use rss::{Channel, ChannelBuilder, ItemBuilder};
use scraper::{Html, Selector}; use scraper::{Html, Selector};
use std::collections::HashMap; use std::collections::HashMap;
use std::{error::Error, fs::File, io::BufReader}; use std::{error::Error, fs::File, io::BufReader};
@ -84,17 +84,12 @@ fn search(url: &str, title: &str) -> Result<(), Box<dyn Error>> {
.build()), .build()),
}?; }?;
let mut items = channel.clone().into_items(); let mut items = channel.clone().into_items();
let guid = GuidBuilder::default()
.value(title.to_string() + &Utc::now().to_rfc2822())
.permalink(false)
.build();
items.push( items.push(
ItemBuilder::default() ItemBuilder::default()
.title(Some(title.to_string())) .title(Some(title.to_string()))
.pub_date(Some(Utc::now().to_rfc2822())) .pub_date(Some(Utc::now().to_rfc2822()))
.link(Some(url.to_string())) .link(Some(url.to_string()))
.description(Some(status)) .description(Some(status))
.guid(Some(guid))
.build(), .build(),
); );
channel.set_items(items); channel.set_items(items);