-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Fotogjengen/hilfling-fron…
…tend into feature/fg-51
- Loading branch information
Showing
17 changed files
with
691 additions
and
248 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,39 +35,4 @@ jobs: | |
if: steps.node-cache.outputs.cache-hit != 'true' | ||
run: npm ci | ||
#- run: npm run build --if-present | ||
- run: npm test | ||
|
||
build: | ||
# The type of runner that the job will run on | ||
runs-on: ubuntu-latest | ||
# Steps represent a sequence of tasks that will be executed as part of the job | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v1 | ||
|
||
- name: Login to DockerHub | ||
uses: docker/login-action@v1 | ||
with: | ||
username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
- name: Build and push Docker images | ||
# You may pin to the exact commit or the version. | ||
# uses: docker/build-push-action@0db984c1826869dcd0740ff26ff75ff543238fd9 | ||
uses: docker/[email protected] | ||
with: | ||
tags: # optional | ||
fotogjengen/hilfling-frontend:latest | ||
push: false #optional, default is false | ||
auto-merge-dependabot: | ||
runs-on: ubuntu-latest | ||
needs: | ||
- test | ||
- build | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: ahmadnassri/action-dependabot-auto-merge@v2 | ||
with: | ||
target: minor | ||
github-token: ${{ secrets.DEPENDABOT_AUTO_MERGE }} | ||
command: merge | ||
- run: npm test |
Oops, something went wrong.