From c54c4f08ebd62f946ab672c8bb68846958397359 Mon Sep 17 00:00:00 2001
From: atavism <paul@getlantern.org>
Date: Tue, 29 Oct 2024 17:29:17 -0700
Subject: [PATCH] update release.yml

---
 .github/workflows/build.yml   |  5 +--
 .github/workflows/release.yml | 64 ++++-------------------------------
 2 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cdc8afb9f..23e1a6d0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,6 @@
 name: Build Lantern
 
 on:
-  push:
-    branches: atavism/ci-updates
   workflow_call:
     inputs:
       version:
@@ -29,6 +27,9 @@ on:
       xcode_version:
         type: string
         required: true
+      macos_version:
+        type: string
+        required: true
 
 env:
   GOPRIVATE: github.com/getlantern
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e82b72e52..f68a17dec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,6 +3,8 @@ name: Publish releases
 on:
   # Triggers the workflow on push when pushing to a version tag
   push:
+    branches:
+      - atavism/ci-updates
     tags:
       - '*lantern-*'
   workflow_run:
@@ -91,42 +93,8 @@ jobs:
           print(f'::set-output name=prefix::{li}')
           print(f'::set-output name=version_file::{vf}')
 
-  build-linux:
-    uses: ./.github/workflows/build-linux.yml
-    secrets: inherit
-    needs: set-version
-    with:
-      version: ${{ needs.set-version.outputs.version }}
-      prefix: ${{ needs.set-version.outputs.prefix }}
-      dist-suffix: x64
-
-  #    build-windows-x32:
-  #      uses: ./.github/workflows/build-windows.yml
-  #      secrets: inherit
-  #      needs: set-version
-  #      with:
-  #        version: ${{ needs.set-version.outputs.version }}
-  #        prefix: ${{ needs.set-version.outputs.prefix }}
-  #        dist-suffix: 32-bit
-  #        installer-suffix: -x32
-  #        update-suffix: 386
-  #        arch: x32
-
-  build-windows-x64:
-    uses: ./.github/workflows/build-windows.yml
-    secrets: inherit
-    needs: set-version
-    with:
-      version: ${{ needs.set-version.outputs.version }}
-      prefix: ${{ needs.set-version.outputs.prefix }}
-      build-suffix: 64
-      dist-suffix: 64-bit
-      update-suffix: x64
-      installer-suffix: -x64
-      arch: x64
-
-  build-darwin:
-    uses: ./.github/workflows/build-darwin.yml
+  build:
+    uses: ./.github/workflows/build.yml
     secrets: inherit
     needs: set-version
     with:
@@ -135,30 +103,12 @@ jobs:
       version: ${{ needs.set-version.outputs.version }}
       version_file: ${{ needs.set-version.outputs.version_file }}
       prefix: ${{ needs.set-version.outputs.prefix }}
-
-  build-ios:
-    uses: ./.github/workflows/build-ios.yml
-    secrets: inherit
-    needs: set-version
-    with:
-      macos_version: macos-14
-      xcode_version: latest-stable
-      version: ${{ needs.set-version.outputs.version }}
-      version_file: ${{ needs.set-version.outputs.version_file }}
-      prefix: ${{ needs.set-version.outputs.prefix }}
-
-  build-android:
-    uses: ./.github/workflows/build-android.yml
-    secrets: inherit
-    needs: set-version
-    with:
-      version: ${{ needs.set-version.outputs.version }}
-      version_file: ${{ needs.set-version.outputs.version_file }}
-      prefix: ${{ needs.set-version.outputs.prefix }}
+      installer-suffix: -x64
+      arch: x64
 
   push-binaries:
     runs-on: ubuntu-latest
-    needs: [ set-version, build-android, build-ios, build-darwin, build-linux, build-windows-x64 ]
+    needs: [ set-version, build ]
     env:
       version: ${{ needs.set-version.outputs.version }}
       prefix: ${{ needs.set-version.outputs.prefix }}