Skip to content

Commit

Permalink
Merge pull request #204 from doerfli/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
doerfli authored Oct 28, 2023
2 parents 1571b2b + 902712e commit a688e4b
Show file tree
Hide file tree
Showing 5 changed files with 429 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u doerfli --password-stdin
- uses: rlespinasse/[email protected]
- run: docker build -f Dockerfile -t docker.pkg.github.com/doerfli/kiddycalc/kiddycalc:${{ env.GITHUB_REF_SLUG }} --build-arg FONTAWESOME_NPM_AUTH_TOKEN=${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }} .
Expand Down
Loading

0 comments on commit a688e4b

Please sign in to comment.