Skip to content

Commit

Permalink
Merge branch 'main' into renovate/lock-file-maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
simonsan authored Sep 20, 2024
2 parents a8cc360 + edeef8b commit 37013a5
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"separateMinorPatch": false,
"prHourlyLimit": 1,
"prConcurrentLimit": 1,
"rebaseConflictedPrs": false,
"rebaseStalePrs": false,
"major": {
"dependencyDashboardApproval": true
},
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
merge_group:
types: [checks_requested]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
audit:
if: ${{ github.repository_owner == 'rustic-rs' }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ on:
merge_group:
types: [checks_requested]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
fmt:
name: Rustfmt
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cross-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ defaults:
run:
shell: bash

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
cross-check:
name: Cross checking ${{ matrix.job.target }}
Expand Down Expand Up @@ -88,6 +92,7 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.job.target }}
use-cross: ${{ matrix.job.use-cross }}
project-cache-key: "rustic_scheduler"

result:
name: Result (Cross-CI)
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
merge_group:
types: [checks_requested]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
style:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/prebuilt-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ on:
env:
BINARY_NAME: rustic-scheduler

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
pr-build:
if: ${{ github.event.label.name == 'S-build' && github.repository_owner == 'rustic-rs' }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
# options:
# - rustic_scheduler

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
determine-package:
name: Determine package to release
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ It allows to define client groups which are all backed up the same way.
- Copy the `rustic-scheduler-server` binary to your backup schedule server and
the `rustic-scheduler-client` binary to all your clients (available under
`/targets/release`).
- Create a config file `./config/rustic_schedulder.toml` on your backup schedule
- Create a config file `./config/rustic_scheduler.toml` on your backup schedule
server (example config is available in the `config/` dir)
- Run the `rustic-scheduler-server` binary on your server in the dir containing
the config.
Expand Down

0 comments on commit 37013a5

Please sign in to comment.