Merge branch 'BlackDex-update-workflow'

This commit is contained in:
Daniel García 2022-09-25 18:54:54 +02:00
commit 69a69e8e04
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
2 changed files with 10 additions and 11 deletions

View file

@ -30,7 +30,10 @@ jobs:
matrix: matrix:
channel: channel:
- "rust-toolchain" # The version defined in rust-toolchain - "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 }} name: Build and Test ${{ matrix.channel }}
@ -63,7 +66,7 @@ jobs:
with: with:
profile: minimal profile: minimal
override: true override: true
toolchain: ${{ matrix.channel }} toolchain: ${{ matrix.version }}
# End Install the MSRV channel to be used # End Install the MSRV channel to be used
@ -193,5 +196,5 @@ jobs:
if: ${{ matrix.channel == 'rust-toolchain' }} if: ${{ matrix.channel == 'rust-toolchain' }}
with: with:
name: vaultwarden name: vaultwarden
path: target/${{ matrix.target-triple }}/release/vaultwarden path: target/release/vaultwarden
# End Upload artifact to Github Actions # End Upload artifact to Github Actions

View file

@ -1,13 +1,9 @@
name: Hadolint name: Hadolint
on: on: [
push: push,
paths: pull_request
- "docker/**" ]
pull_request:
paths:
- "docker/**"
jobs: jobs:
hadolint: hadolint: