Skip to content

Commit

Permalink
Merge pull request #19 from amosproj/develop
Browse files Browse the repository at this point in the history
Merge pull request #18 from amosproj/main
  • Loading branch information
KonsumGandalf authored Apr 27, 2024
2 parents c1aea1a + af5d652 commit 49897aa
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

backend:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend
tags: |
type=ref,event=branch
type=ref,event=pr
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint-test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
fetch-depth: 0

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8

Expand All @@ -44,7 +44,7 @@ jobs:
with:
fetch-depth: 1

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8

Expand All @@ -67,7 +67,7 @@ jobs:
with:
fetch-depth: 1

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8

Expand All @@ -90,7 +90,7 @@ jobs:
with:
fetch-depth: 1

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: Release Please

on:
push:
branches:
Expand All @@ -14,5 +16,4 @@ jobs:
- uses: google-github-actions/release-please-action@v4
with:
release-type: node
package-name: xcelerator-demo
target-branch: main
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
backend:
depends_on:
- postgres
# image: ghcr.io/amosproj/amos2024ss01-xcelerator-demo-app-backend
image: ghcr.io/amosproj/amos2024ss01-xcelerator-demo-app-backend
build:
context: .
target: production
Expand All @@ -43,7 +43,7 @@ services:
frontend:
depends_on:
- backend
# image: ghcr.io/amosproj/amos2024ss01-xcelerator-demo-app-frontend
image: ghcr.io/amosproj/amos2024ss01-xcelerator-demo-app-frontend
build:
context: .
target: production
Expand Down

0 comments on commit 49897aa

Please sign in to comment.