Skip to content

Commit

Permalink
Merge pull request #2 from samgozman/add-cd-action
Browse files Browse the repository at this point in the history
Artefacts CD
  • Loading branch information
samgozman authored Apr 7, 2023
2 parents fc3ed04 + 0234d2e commit 544e8e1
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 18 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2

updates:
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
target-branch: "main"
open-pull-requests-limit: 4

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
target-branch: "main"
43 changes: 43 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CD

permissions:
contents: write

on:
release:
types: [created]

jobs:
create-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: taiki-e/create-gh-release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}

upload-assets:
strategy:
matrix:
include:
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest
- target: aarch64-apple-darwin
os: macos-latest
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
- target: x86_64-apple-darwin
os: macos-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install cross-compilation tools
uses: taiki-e/setup-cross-toolchain-action@v1
with:
target: ${{ matrix.target }}
if: startsWith(matrix.os, 'ubuntu')
- uses: taiki-e/upload-rust-binary-action@v1
with:
bin: rvp
target: ${{ matrix.target }}
token: ${{ secrets.GITHUB_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
on:
pull_request:
# push:
# branches: [main]
branches: [main]
push:
branches: [main]

name: CI

Expand Down
8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ keywords = ["rvp", "parser", "cli"]
rust-version = "1.68.0"
include = ["src/**/*", "LICENSE", "README.md"]

[[bin]]
name = "rvp"
path = "src/main.rs"

[profile.release]
lto = true
strip = true

[dependencies]
clap = { version = "4.1.8", features = ["derive"] }
anyhow = "1.0.69"
Expand Down
14 changes: 7 additions & 7 deletions src/scalper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,25 +232,25 @@ mod tests {

#[test]
fn test_any_string_to_number() {
let value = any_string_to_number(&"1.234,56".to_string());
let value = any_string_to_number("1.234,56");
assert_eq!(value, 1234.56);

let value = any_string_to_number(&"100_000,5".to_string());
let value = any_string_to_number("100_000,5");
assert_eq!(value, 100_000.5);

let value = any_string_to_number(&"100 000 $".to_string());
let value = any_string_to_number("100 000 $");
assert_eq!(value, 100_000.0);

let value = any_string_to_number(&"1.5k$".to_string());
let value = any_string_to_number("1.5k$");
assert_eq!(value, 1500.0);

let value = any_string_to_number(&"1.5m ¢".to_string());
let value = any_string_to_number("1.5m ¢");
assert_eq!(value, 1_500_000.0);

let value = any_string_to_number(&"1.5b CAD$".to_string());
let value = any_string_to_number("1.5b CAD$");
assert_eq!(value, 1_500_000_000.0);

let value = any_string_to_number(&"Not a Number".to_string());
let value = any_string_to_number("Not a Number");
assert!(value.is_nan());
}
}
18 changes: 9 additions & 9 deletions src/structure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,10 @@ mod tests {
SelectorType::Number,
);

let selectors = vec![s0.clone(), s1.clone()];
let selectors = vec![s0, s1];

let r0 = Resource::new("https://test.com/?id=%%".to_string(), selectors.clone());
let r1 = Resource::new("https://test2.com".to_string(), selectors.clone());
let r1 = Resource::new("https://test2.com".to_string(), selectors);

let resources = vec![r0.clone(), r1.clone()];

Expand Down Expand Up @@ -351,8 +351,8 @@ mod tests {
assert_eq!(r2.url, "https://test.com/?id=test");

// Test needs_parameter
assert_eq!(r0.needs_parameter(), true);
assert_eq!(r1.needs_parameter(), false);
assert!(r0.needs_parameter());
assert!(!r1.needs_parameter());
}

#[test]
Expand All @@ -364,19 +364,19 @@ mod tests {
SelectorType::Number,
);

let selectors = vec![s0.clone(), s1.clone()];
let selectors = vec![s0, s1];

let r0 = Resource::new("https://test.com/?id=%%".to_string(), selectors.clone());
let r1 = Resource::new("https://test2.com".to_string(), selectors.clone());
let r1 = Resource::new("https://test2.com".to_string(), selectors);

let resources = vec![r0.clone(), r1.clone()];
let resources = vec![r0, r1];

let config = Config::new("test".to_string(), "".to_string(), resources.clone());
let config = Config::new("test".to_string(), "".to_string(), resources);

assert_eq!(config.name, "test");
assert_eq!(config.resources[0].url, "https://test.com/?id=%%");

// Test needs_parameters
assert_eq!(config.needs_parameters(), true);
assert!(config.needs_parameters());
}
}

0 comments on commit 544e8e1

Please sign in to comment.