Browse Source

workflow fixes

pull/782/head
Jason Dove 4 years ago
parent
commit
fe7181ea1d
  1. 2
      .github/workflows/artifacts.yml
  2. 12
      .github/workflows/docker.yml

2
.github/workflows/artifacts.yml

@ -190,7 +190,7 @@ jobs:
run: dotnet clean --configuration Release && dotnet nuget locals all --clear run: dotnet clean --configuration Release && dotnet nuget locals all --clear
- name: Install dependencies - name: Install dependencies
run: dotnet restore -r "${{ matrix.target}}" run: dotnet restore -r "${{ matrix.target }}"
- uses: suisei-cn/actions-download-file@v1 - uses: suisei-cn/actions-download-file@v1
if: ${{ matrix.kind }} == "windows" if: ${{ matrix.kind }} == "windows"

12
.github/workflows/docker.yml

@ -27,13 +27,13 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- id: builder-base - name: base
path: '' path: ''
suffix: '' suffix: ''
- id: builder-nvidia - name: nvidia
path: 'nvidia/' path: 'nvidia/'
suffix: '-nvidia' suffix: '-nvidia'
- id: builder-vaapi - name: vaapi
path: 'vaapi/' path: 'vaapi/'
suffix: '-vaapi' suffix: '-vaapi'
steps: steps:
@ -42,9 +42,9 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up Docker Buildx Base - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
id: ${{ matrix.id }} id: docker-buildx
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
@ -55,7 +55,7 @@ jobs:
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
builder: ${{ format('steps.{0}.outputs.name', matrix.id) }} builder: ${{ steps.docker-buildx.outputs.name }}
context: . context: .
file: ./docker/${{ matrix.path }}Dockerfile file: ./docker/${{ matrix.path }}Dockerfile
push: true push: true

Loading…
Cancel
Save