sync GitHub Actions

Author: mythz

.github/workflows/build-container.yml

@@ -12,6 +12,7 @@ on:
       - master
   workflow_dispatch:
 
+# Only update envs here if you need to change them for this workflow
 env:
   DOCKER_BUILDKIT: 1
   KAMAL_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
@@ -31,20 +32,12 @@ jobs:
           echo "repository_name=$(echo ${{ github.repository }} | cut -d '/' -f 2)" >> $GITHUB_ENV
           echo "repository_name_lower=$(echo ${{ github.repository }} | cut -d '/' -f 2 | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
           echo "org_name=$(echo ${{ github.repository }} | cut -d '/' -f 1)" >> $GITHUB_ENV
-          if [ -n "${{ secrets.APPSETTINGS_PATCH }}" ]; then
-            echo "HAS_APPSETTINGS_PATCH=true" >> $GITHUB_ENV
-          else
-            echo "HAS_APPSETTINGS_PATCH=false" >> $GITHUB_ENV
-          fi
-          if [ -n "${{ secrets.KAMAL_DEPLOY_IP }}" ]; then
-            echo "HAS_DEPLOY_ACTION=true" >> $GITHUB_ENV
-          else
-            echo "HAS_DEPLOY_ACTION=false" >> $GITHUB_ENV
-          fi
 
       # This step is for the deployment of the templates only, safe to delete
       - name: Modify csproj for template deploy
-        if: env.HAS_DEPLOY_ACTION == 'true'
+        env: 
+          KAMAL_DEPLOY_IP: ${{ secrets.KAMAL_DEPLOY_IP }}
+        if: env.KAMAL_DEPLOY_IP != null
         run: |
           sed -i 's#<ContainerLabel Include="service" Value="my-app" />#<ContainerLabel Include="service" Value="${{ env.repository_name_lower }}" />#g' MyApp/MyApp.csproj
 
@@ -76,7 +69,9 @@ jobs:
         run: dotnet tool install -g x
 
       - name: Apply Production AppSettings
-        if: env.HAS_APPSETTINGS_PATCH == 'true'
+        env:
+          APPSETTINGS_PATCH: ${{ secrets.APPSETTINGS_PATCH }}      
+        if: env.APPSETTINGS_PATCH != null
         working-directory: ./MyApp
         run: |
           cat <<EOF >> appsettings.json.patch

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/checkout@v5

.github/workflows/release.yml

@@ -16,6 +16,7 @@ env:
   DOCKER_BUILDKIT: 1
   KAMAL_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
   KAMAL_REGISTRY_USERNAME: ${{ github.actor }}
+  SERVICESTACK_LICENSE: ${{ secrets.SERVICESTACK_LICENSE }}
 
 jobs:
   release:
@@ -36,15 +37,12 @@ jobs:
           else
             echo "HAS_MIGRATIONS=false" >> $GITHUB_ENV
           fi
-          if [ -n "${{ secrets.KAMAL_DEPLOY_IP }}" ]; then
-            echo "HAS_DEPLOY_ACTION=true" >> $GITHUB_ENV
-          else
-            echo "HAS_DEPLOY_ACTION=false" >> $GITHUB_ENV
-          fi
 
       # This step is for the deployment of the templates only, safe to delete
       - name: Modify deploy.yml
-        if: env.HAS_DEPLOY_ACTION == 'true'
+        env: 
+          KAMAL_DEPLOY_IP: ${{ secrets.KAMAL_DEPLOY_IP }}
+        if: env.KAMAL_DEPLOY_IP != null
         run: |
           sed -i "s/service: my-app/service: ${{ env.repository_name_lower }}/g" config/deploy.yml
           sed -i "s#image: my-user/myapp#image: ${{ env.image_repository_name }}#g" config/deploy.yml

.kamal/secrets

@@ -5,6 +5,7 @@
 # Option 1: Read secrets from the environment
 KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
 KAMAL_REGISTRY_USERNAME=$KAMAL_REGISTRY_USERNAME
+SERVICESTACK_LICENSE=$SERVICESTACK_LICENSE
 
 # Option 2: Read secrets via a command
 # RAILS_MASTER_KEY=$(cat config/master.key)

config/deploy.yml

@@ -6,7 +6,10 @@ image: my-user/myapp
 
 # Required for use of ASP.NET Core with Kamal-Proxy.
 env:
-  ASPNETCORE_FORWARDEDHEADERS_ENABLED: true
+  clear:
+    ASPNETCORE_FORWARDEDHEADERS_ENABLED: true
+  secret:
+    - SERVICESTACK_LICENSE
 
 # Deploy to these servers.
 servers: