diff --git a/.github/workflows/approve.yml b/.github/workflows/approve.yml index 72a3a06..d822000 100644 --- a/.github/workflows/approve.yml +++ b/.github/workflows/approve.yml @@ -1,8 +1,8 @@ name: Automatic Approve on: - schedule: - - cron: "0 0 * * *" - workflow_dispatch: + schedule: + - cron: 0 0 * * * + workflow_dispatch: null jobs: automatic-approve: name: Automatic Approve @@ -11,6 +11,6 @@ jobs: - name: Automatic Approve uses: mheap/automatic-approve-action@v1.1.0 with: - token: ${{ secrets.GITHUB_TOKEN }} - workflows: "rust.yml" - dangerous_files: "src/main.rs,Cargo.toml,Cargo.lock" + token: '${{ secrets.GITHUB_TOKEN }}' + workflows: rust.yml + dangerous_files: 'src/main.rs,Cargo.toml,Cargo.lock' diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 549f995..136ce1b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,43 +1,41 @@ name: Rust - on: push: - branches: [ master ] + branches: + - master pull_request: - branches: [ master ] + branches: + - master schedule: - - cron: '0 0 * * *' - + - cron: 0 0 * * * env: CARGO_TERM_COLOR: always - jobs: build: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - uses: Swatinem/rust-cache@v1 - - name: Get random cache id - run: echo "CACHE_ID=$((RANDOM))" >> $GITHUB_ENV - shell: bash - - uses: pat-s/always-upload-cache@v2.1.5 - with: - path: results/results.yaml - key: results-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('README.md') }}-${{ env.CACHE_ID }} - restore-keys: | - results-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('README.md') }}- - results-${{ hashFiles('Cargo.lock') }}- - results- - - name: Build - run: cargo build - - name: Run - run: cargo run - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RUST_LOG: warn + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - uses: Swatinem/rust-cache@v1 + - name: Get random cache id + run: echo "CACHE_ID=$((RANDOM))" >> $GITHUB_ENV + shell: bash + - uses: pat-s/always-upload-cache@v2.1.5 + with: + path: results/results.yaml + key: results-${{ hashFiles(''Cargo.lock'') }}-${{ hashFiles(''README.md'') }}-${{ env.CACHE_ID }} + restore-keys: | + results-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('README.md') }}- + results-${{ hashFiles('Cargo.lock') }}- + results- + - name: Build + run: cargo build + - name: Run + run: cargo run + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RUST_LOG: warn diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de95a5c..4bf7bef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,11 +14,10 @@ If you want to add an entry to the `README.md` please consider this: - if you want to add something, please use the template `[ACCOUNT/REPO](https://github.com/ACCOUNT/REPO) [[CRATE](https://crates.io/crates/CRATE)] — DESCRIPTION` * if you've not published your crate to `crates.io` remove the `[[CRATE](...)]` part. * if you have a CI build, please add the build badge. Put the image after the description, separated by a space. Please make sure to add the branch information to the image: - * example for Travis: ` [](https://travis-ci.org/XXX/CRATE)` - * for Github actions please see https://docs.github.com/en/actions/managing-workflow-runs/adding-a-workflow-status-badge + * example for Travis: `[](https://travis-ci.org/XXX/CRATE)` + * for Github actions please see [adding-a-workflow-status-badge](https://docs.github.com/en/actions/managing-workflow-runs/adding-a-workflow-status-badge) - please pay attention to the alphabetical ordering. - ## Removing projects We don't remove projects unless they are outright broken or pronounced deprecated by another project or by its author. diff --git a/Cargo.toml b/Cargo.toml index e238891..06761c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,4 +23,4 @@ regex = "1" scraper = "0.11" chrono = { version = "0.4", features = ["serde"] } chrono-humanize = "0.2" -diffy = "0.2" \ No newline at end of file +diffy = "0.2" diff --git a/results/.gitignore b/results/.gitignore index 96a88f2..4b18473 100644 --- a/results/.gitignore +++ b/results/.gitignore @@ -1,2 +1,2 @@ # Note that this is in a directory so we can cache it with Travis -results.yaml \ No newline at end of file +results.yaml diff --git a/src/main.rs b/src/main.rs index ea03fe7..173b48d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -488,4 +488,4 @@ async fn main() -> Result<(), Error> { } else { Err(format_err!("{} urls with errors", failed)) } -} \ No newline at end of file +}