Skip to content

Commit

Permalink
Merge pull request #168 from seanmorley15/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
seanmorley15 authored Aug 6, 2024
2 parents 5386ffa + 1f2699e commit 82e69ca
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Upload Docker image to GHCR
name: Upload latest backend image to GHCR

on:
push:
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/backend-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Publish backend release

on:
release:
types: [published]

env:
IMAGE_NAME: "adventurelog-backend"

jobs:
upload:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.ACESS_TOKEN }}

- name: Build Docker image
run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./backend

- name: Tag Docker image
run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }}

- name: Push Docker image to GHCR
run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }}
4 changes: 2 additions & 2 deletions .github/workflows/frontend-latest.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Upload Docker image to GHCR
name: Upload latest frontend image to GHCR

on:
push:
branches:
- main
paths:
- 'frontend/**'
- "frontend/**"

env:
IMAGE_NAME: "adventurelog-frontend"
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/frontend-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Publish frontend release

on:
release:
types: [published]

env:
IMAGE_NAME: "adventurelog-frontend"

jobs:
upload:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.ACESS_TOKEN }}

- name: Build Docker image
run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./frontend

- name: Tag Docker image
run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }}

- name: Push Docker image to GHCR
run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }}
3 changes: 1 addition & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "adventurelog-frontend",
"version": "0.0.1",
"private": true,
"version": "0.5.0",
"scripts": {
"dev": "vite dev",
"django": "cd .. && cd backend/server && python3 manage.py runserver",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export let appVersion = 'Web v0.4.1';
export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.4.1';
export let appVersion = 'Web v0.5.0';
export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.5.0';
export let appTitle = 'AdventureLog';
export let copyrightYear = '2024';
2 changes: 1 addition & 1 deletion frontend/src/routes/map/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<Marker
{lngLat}
on:click={() => (clickedName = name)}
class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-2xl focus:outline-2 focus:outline-black"
class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-md"
>
<svg
width="24"
Expand Down

0 comments on commit 82e69ca

Please sign in to comment.