From 176734de35a38b5d9a02a893ddcf4f8d5f3fa3aa Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Sat, 14 Feb 2026 07:16:58 +0200
Subject: [PATCH 1/2] Update CI to publish OTA release on PR merge

---
 .github/workflows/blank.yml | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml
index 0df0da6..a871cbb 100644
--- a/.github/workflows/blank.yml
+++ b/.github/workflows/blank.yml
@@ -1,37 +1,38 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
-  push:
-    branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
+    types: [closed]
+    branches: ["main"]
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+permissions:
+  contents: write
+
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
+  release:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      # Runs a single command using the runners shell
-      - name: Run a one-line script
+      - name: Build skins
         run: ./build_skins.sh
 
-      - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v3
+      - name: Create OTA release archive
+        run: |
+          mkdir -p dist
+          cd OTA
+          find . -type f ! -path './.*' ! -path '*/.*' -print0 \
+            | sort -z \
+            | tar --null -czf "../dist/ota-${GITHUB_SHA}.tar.gz" --files-from -
+
+      - name: Publish release
+        uses: softprops/action-gh-release@v2
         with:
-          name: SamsungGalaxyS7.skin
-          path: OTA/SamsungGalaxyS7.skin
-          retention-days: 5
+          tag_name: ota-${{ github.sha }}
+          name: OTA Release ${{ github.sha }}
+          generate_release_notes: true
+          files: dist/ota-${{ github.sha }}.tar.gz

From 706c97cdeaac5ac12dc0b35d790f27a123fb4900 Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Sat, 14 Feb 2026 07:22:32 +0200
Subject: [PATCH 2/2] Adjust CI to always build and release only on master
 merges

---
 .github/workflows/blank.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml
index a871cbb..2567513 100644
--- a/.github/workflows/blank.yml
+++ b/.github/workflows/blank.yml
@@ -2,17 +2,16 @@ name: CI
 
 on:
   pull_request:
-    types: [closed]
-    branches: ["main"]
-
+    branches: ["master"]
+  push:
+    branches: ["master"]
   workflow_dispatch:
 
 permissions:
   contents: write
 
 jobs:
-  release:
-    if: github.event.pull_request.merged == true
+  build:
     runs-on: ubuntu-latest
 
     steps:
@@ -21,6 +20,14 @@ jobs:
       - name: Build skins
         run: ./build_skins.sh
 
+  release:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
       - name: Create OTA release archive
         run: |
           mkdir -p dist