Skip to content
Merged

Beta #122

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,22 @@ env:

jobs:
docker:
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v6
uses: useblacksmith/build-push-action@v2
with:
push: true
tags: luc1412/easyfnstats-image:${{ env.DOCKER_TAG }}
cache-from: type=gha,scope=${{ github.workflow }}-${{ github.ref_name }}
cache-to: type=gha,scope=${{ github.workflow }}-${{ github.ref_name }},mode=max
- name: Discord notification
if: success()
uses: Ilshidur/action-discord@master
Expand Down
2 changes: 1 addition & 1 deletion Controllers/ShopImageController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ private async Task<SKBitmap> GenerateLocaleTemplate(Shop shop, SKBitmap template
var shopSection = shop.Sections.FirstOrDefault(x => x.Id == sectionLocationData.Id);

// Draw the section name if it exists
if (sectionLocationData.Name != null)
if (sectionLocationData.Name != null && shopSection?.Name != null)
{
using var sectionNamePaint = new SKPaint();
sectionNamePaint.IsAntialias = true;
Expand Down