Revert CI images in GitHub (#101)

* Revert "use versioned branch names for release images (#93)"

This reverts commit a4842a7.

* Revert "ci: push release images to branch instead of GitHub release (#90)"

This reverts commit c937d27.

Author: greatgitsby

.github/workflows/build.yml

@@ -130,23 +130,29 @@ jobs:
           path: build/
 
       - name: generate manifest
+        env:
+          RELEASE_URL: https://github.com/${{ github.repository }}/releases/download/v${{ env.VERSION }}
         run: |
           VERSION=$(cat userspace/root/VERSION)
-          BRANCH="v${VERSION}"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
-          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
-          BASE_URL="https://raw.githubusercontent.com/${{ github.repository }}/${BRANCH}"
-          BASE_URL=$BASE_URL python3 tools/build/package_ota.py
+          RELEASE_URL="https://github.com/${{ github.repository }}/releases/download/v${VERSION}"
+          RELEASE_URL=$RELEASE_URL python3 tools/build/package_ota.py
 
-      - name: push images to version branch
+      - name: create release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cd build/ota
-          git init
-          git checkout --orphan "$BRANCH"
-          git add .
-          git -c user.name="github-actions" -c user.email="[email protected]" \
-            commit -m "release images for $BRANCH"
-          git remote add origin "https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git"
-          git push --force origin "$BRANCH"
+          TAG="v${VERSION}"
+
+          # Delete existing release if it exists
+          gh release delete "$TAG" --yes 2>/dev/null || true
+          git tag -d "$TAG" 2>/dev/null || true
+          git push origin ":refs/tags/$TAG" 2>/dev/null || true
+
+          # Create release with all images and manifest
+          gh release create "$TAG" \
+            --title "vamOS $TAG" \
+            --target "${{ github.sha }}" \
+            --notes "Automated release from commit ${{ github.sha }}" \
+            build/ota/*.img \
+            build/ota/manifest.json

tools/build/package_ota.py

@@ -12,9 +12,8 @@
 OTA_OUTPUT_DIR = OUTPUT_DIR / "ota"
 
 SECTOR_SIZE = 4096
-CHUNK_SIZE = 52_428_800  # 50 MB - must be under raw.githubusercontent.com's 100 MB limit
 
-BASE_URL = os.environ.get("BASE_URL", "https://raw.githubusercontent.com/commaai/vamOS/release-images")
+RELEASE_URL = os.environ.get("RELEASE_URL", "https://github.com/commaai/vamos/releases/download/untagged")
 
 GPT = namedtuple('GPT', ['lun', 'name', 'path', 'start_sector', 'num_sectors', 'has_ab', 'full_check'])
 GPTS = [
@@ -74,30 +73,14 @@ def process_file(entry):
   sha256.update(b'\x00' * ((SECTOR_SIZE - (size % SECTOR_SIZE)) % SECTOR_SIZE))
   ondevice_hash = sha256.hexdigest()
 
-  base_name = f"{entry.name}-{hash_raw}.img"
-
-  # Write file(s) to output directory, splitting into chunks if needed
-  chunks = None
-  if size > CHUNK_SIZE:
-    chunks = []
-    chunk_idx = 0
-    with open(entry.path, 'rb') as f:
-      while True:
-        data = f.read(CHUNK_SIZE)
-        if not data:
-          break
-        chunk_name = f"{base_name}.{chunk_idx:02d}"
-        (OTA_OUTPUT_DIR / chunk_name).write_bytes(data)
-        chunks.append({"url": f"{BASE_URL}/{chunk_name}", "size": len(data)})
-        print(f"  chunk {chunk_idx}: {chunk_name} ({len(data)} bytes)")
-        chunk_idx += 1
-  else:
-    print(f"  copying to {base_name}")
-    shutil.copy(entry.path, OTA_OUTPUT_DIR / base_name)
+  # Copy to output directory
+  out_fn = OTA_OUTPUT_DIR / f"{entry.name}-{hash_raw}.img"
+  print(f"  copying to {out_fn.name}")
+  shutil.copy(entry.path, out_fn)
 
   ret = {
     "name": entry.name,
-    "url": f"{BASE_URL}/{base_name}",
+    "url": f"{RELEASE_URL}/{out_fn.name}",
     "hash": hash,
     "hash_raw": hash_raw,
     "size": size,
@@ -107,10 +90,6 @@ def process_file(entry):
     "ondevice_hash": ondevice_hash,
   }
 
-  if chunks:
-    ret["url"] = ""
-    ret["chunks"] = chunks
-
   if isinstance(entry, GPT):
     ret["gpt"] = {
       "lun": entry.lun,