diff options
| author | BlackDex <[email protected]> | 2022-09-15 16:51:52 +0200 |
|---|---|---|
| committer | BlackDex <[email protected]> | 2022-09-15 16:51:52 +0200 |
| commit | 81984c4bce4e8004d9fd65f2704afa8d402cd53a (patch) | |
| tree | 51921588a337b5d85f0c58d8aef7ef5742734441 /.github | |
| parent | 9c891baad1838eb3446a90b2d6d71ebace9b347c (diff) | |
| download | vaultwarden-81984c4bce4e8004d9fd65f2704afa8d402cd53a.tar.gz vaultwarden-81984c4bce4e8004d9fd65f2704afa8d402cd53a.zip | |
Update build workflow
Currently the branch protection is set on specific workflows which needs
to be run every time a PR is created (or a push).
Because it isn't possible to tell the branch protection only to do it's
job if specific files are touched or not, we just need to make sure
these jobs are always started.
Also, because we now check the builds for an MSRV, and the title would
change all the time, that would cause the branch protection to be
updated everytime the MSRV would change. This is now also addressed by
naming that job 'msrv' instead of the version number.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/hadolint.yml | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90763d1b..47080daf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,10 @@ jobs: matrix: channel: - "rust-toolchain" # The version defined in rust-toolchain - - "1.60.0" # The supported MSRV + - "msrv" # The supported MSRV + include: + - channel: "msrv" + version: "1.60.0" name: Build and Test ${{ matrix.channel }} @@ -63,7 +66,7 @@ jobs: with: profile: minimal override: true - toolchain: ${{ matrix.channel }} + toolchain: ${{ matrix.version }} # End Install the MSRV channel to be used @@ -193,5 +196,5 @@ jobs: if: ${{ matrix.channel == 'rust-toolchain' }} with: name: vaultwarden - path: target/${{ matrix.target-triple }}/release/vaultwarden + path: target/release/vaultwarden # End Upload artifact to Github Actions diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 5865bf63..738c3167 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -1,13 +1,9 @@ name: Hadolint -on: - push: - paths: - - "docker/**" - - pull_request: - paths: - - "docker/**" +on: [ + push, + pull_request + ] jobs: hadolint: |