diff --git a/.github/workflows/prerelease-notification.yml b/.github/workflows/prerelease-notification.yml index 82a0271e0..7da51064c 100644 --- a/.github/workflows/prerelease-notification.yml +++ b/.github/workflows/prerelease-notification.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: tags: - - 'lantern-[0-9]+.[0-9]+.[0-9]+-**' + - 'prerelease-[0-9]+.[0-9]+.[0-9]+-**' jobs: create-release: diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml index 348a53fe8..315c5f771 100644 --- a/.github/workflows/release-changelog.yml +++ b/.github/workflows/release-changelog.yml @@ -5,7 +5,7 @@ on: push: tags: # a prerelease noted by a hyphen will not trigger - - 'lantern-[0-9]+.[0-9]+.[0-9]+' + - 'prerelease-[0-9]+.[0-9]+.[0-9]+' jobs: create-release: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ff993ce7..bab1568cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -252,18 +252,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: @@ -296,17 +284,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/