Merge branch 'master' into fix_collections

This commit is contained in:
Travis Shivers 2020-10-23 21:34:32 -05:00 committed by GitHub
commit dc9a90ac66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.3 - uses: actions/checkout@v2.3.3
- uses: ahmadnassri/action-dependabot-auto-merge@v2.1.4 - uses: ahmadnassri/action-dependabot-auto-merge@v2.2.0
with: with:
target: minor target: minor
github-token: ${{ secrets.PAT }} github-token: ${{ secrets.PAT }}

View File

@ -84,7 +84,7 @@ jobs:
- name: Build and push - name: Build and push
id: docker-build id: docker-build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2.0.0
with: with:
push: true push: true
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}

View File

@ -82,7 +82,7 @@ jobs:
- name: Semantic release - name: Semantic release
id: release id: release
uses: ahmadnassri/action-semantic-release@v1.2.8 uses: ahmadnassri/action-semantic-release@v1.4.0
env: env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -189,7 +189,7 @@ jobs:
- name: Build and push - name: Build and push
id: docker-build id: docker-build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2.0.0
with: with:
push: true push: true
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}