Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

This commit is contained in:
iceman1001 2021-01-05 15:21:08 +01:00
commit cbd46913a8
2 changed files with 10 additions and 10 deletions

View file

@ -3,7 +3,7 @@ name: MacOS Build and Test
on: [push, pull_request]
jobs:
build-make:
macos-make:
runs-on: macos-latest
steps:
@ -36,9 +36,9 @@ jobs:
- name: Test
run: make check
build-make-btaddon:
macos-make-btaddon:
if: always()
needs: [build-make]
needs: [macos-make]
runs-on: macos-latest
steps:
@ -72,9 +72,9 @@ jobs:
- name: Test
run: make check
build-cmake:
macos-cmake:
if: always()
needs: [build-make, build-make-btaddon]
needs: [macos-make, macos-make-btaddon]
runs-on: macos-latest
steps:

View file

@ -3,7 +3,7 @@ name: Ubuntu Build and Test
on: [push, pull_request]
jobs:
build-make:
ubuntu-make:
runs-on: ubuntu-latest
steps:
@ -26,9 +26,9 @@ jobs:
- name: Test
run: make check
build-make-btaddon:
ubuntu-make-btaddon:
if: always()
needs: [build-make]
needs: [ubuntu-make]
runs-on: ubuntu-latest
steps:
@ -52,9 +52,9 @@ jobs:
- name: Test
run: make check
build-cmake:
ubuntu-cmake:
if: always()
needs: [build-make, build-make-btaddon]
needs: [ubuntu-make, ubuntu-make-btaddon]
runs-on: ubuntu-latest
steps: