From 0cc086bff938e68e3f03c11999fa100d8a4a27f3 Mon Sep 17 00:00:00 2001
From: atavism <paul@getlantern.org>
Date: Wed, 12 Jun 2024 14:44:42 -0700
Subject: [PATCH] merge latest

---
 .github/workflows/prerelease-notification.yml | 10 +++++-----
 .github/workflows/release-changelog.yml       | 12 ++++++------
 .github/workflows/release.yml                 | 19 -------------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/prerelease-notification.yml b/.github/workflows/prerelease-notification.yml
index 172a2a39a..82a0271e0 100644
--- a/.github/workflows/prerelease-notification.yml
+++ b/.github/workflows/prerelease-notification.yml
@@ -1,10 +1,10 @@
 name: Prerelease Notification
 
-#on:
-#  workflow_dispatch:
-#  push:
-#    tags:
-#      - 'lantern-[0-9]+.[0-9]+.[0-9]+-**'
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'lantern-[0-9]+.[0-9]+.[0-9]+-**'
 
 jobs:
   create-release:
diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml
index fc2c2a61e..348a53fe8 100644
--- a/.github/workflows/release-changelog.yml
+++ b/.github/workflows/release-changelog.yml
@@ -1,11 +1,11 @@
 name: Release and Changelog
 
-#on:
-#  workflow_dispatch:
-#  push:
-#    tags:
-#      # a prerelease noted by a hyphen will not trigger
-#      - 'lantern-[0-9]+.[0-9]+.[0-9]+'
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      # a prerelease noted by a hyphen will not trigger
+      - 'lantern-[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   create-release:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 14ef453db..565dc2a5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -256,18 +256,6 @@ jobs:
         version: ${{ needs.set-version.outputs.version }}
         prefix: ${{ needs.set-version.outputs.prefix }}
       steps:
-        - name: Download the mac build output
-          uses: actions/download-artifact@v4
-          with:
-            name: osx-build
-        - name: Download the linux build output
-          uses: actions/download-artifact@v4
-          with:
-            name: linux-build
-        - name: Download the windows64 build output
-          uses: actions/download-artifact@v4
-          with:
-            name: windows64-installer-signed
         - name: Download the apk build output
           uses: actions/download-artifact@v3
           with:
@@ -300,17 +288,10 @@ jobs:
           run: |
             diff lantern-installer.apk ${{ env.prefix }}.apk || mv -f lantern-installer.apk ${{ env.prefix }}.apk
             diff lantern-installer.aab ${{ env.prefix }}.aab || mv -f lantern-installer.aab ${{ env.prefix }}.aab
-            mv "lantern_${{env.version}}_x64.deb" ${{ env.prefix }}-64-bit.deb
-            mv -f lantern-installer.dmg ${{ env.prefix }}.dmg
-            diff lantern-installer-x64.exe ${{ env.prefix }}-64-bit.exe || mv -f lantern-installer-x64.exe ${{ env.prefix }}-64-bit.exe
         - name: Prepare sha256 sums
           run: |
             shasum -a 256 ${{ env.prefix }}.apk | cut -d " " -f 1 > ${{ env.prefix }}.apk.sha256
             shasum -a 256 ${{ env.prefix }}.aab | cut -d " " -f 1 > ${{ env.prefix }}.aab.sha256
-            shasum -a 256 ${{ env.prefix }}-mac.dmg | cut -d " " -f 1 > ${{ env.prefix }}-mac.dmg.sha256
-            shasum -a 256 ${{ env.prefix }}-mac_arm.dmg | cut -d " " -f 1 > ${{ env.prefix }}-mac_arm.dmg.sha256
-            shasum -a 256 ${{ env.prefix }}-x64.exe | cut -d " " -f 1 > ${{ env.prefix }}-x64.exe.sha256
-            shasum -a 256 ${{ env.prefix }}-64-bit.deb | cut -d " " -f 1 > ${{ env.prefix }}-64-bit.deb.sha256
         - name: Commit
           run: |
             mv lantern-installer* ./lantern-binaries/