Merge pull request #353 from satisfactorymodding/fix-deploy

satisfactorymodding · Dec 4, 2024 · 59e90f5 · 59e90f5
2 parents d6ae8b4 + ab87272
commit 59e90f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Build and push Docker image
+      - name: Build Docker image (without pushing)
         uses: docker/build-push-action@v5
         with:
           context: .

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -74,6 +74,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            suffix=-${{ github.run_id }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
@@ -84,7 +86,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image (development)
         uses: docker/build-push-action@v5
         if: github.ref == 'refs/heads/Dev'
         with:

diff --git a/cspell.json b/cspell.json
@@ -77,6 +77,7 @@
         "MSVC",
         "Nobelisk",
         "noclip",
+        "noprefix",
         "NSLOCTEXT",
         "nullptr",
         "nullrhi",
@@ -90,6 +91,7 @@
         "redirectors",
         "Robb",
         "RTPC",
+        "sarisia",
         "SCBP",
         "Schem",
         "SCIM",