Workflows: Merge pre-release and snapshot workflows
When the snapshot is manually triggered, it will also create a pre-release
This commit is contained in:
parent
040e03716f
commit
a3da8e339a
23
.github/workflows/prerelease.yml
vendored
23
.github/workflows/prerelease.yml
vendored
|
@ -23,6 +23,13 @@ jobs:
|
|||
steps:
|
||||
- run: "true"
|
||||
|
||||
prerelease:
|
||||
needs: version
|
||||
name: Create pre-release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: "true"
|
||||
|
||||
ubuntu:
|
||||
needs: version
|
||||
name: Ubuntu
|
||||
|
@ -30,7 +37,7 @@ jobs:
|
|||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
ubuntu-release:
|
||||
needs: ubuntu
|
||||
needs: [ubuntu, prerelease]
|
||||
name: Ubuntu
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
|
@ -45,7 +52,7 @@ jobs:
|
|||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
appimage-release:
|
||||
needs: appimage
|
||||
needs: [appimage, prerelease]
|
||||
name: AppImage
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
|
@ -63,7 +70,7 @@ jobs:
|
|||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
nuitka-win-release:
|
||||
needs: nuitka-win
|
||||
needs: [nuitka-win, prerelease]
|
||||
name: Nuitka Windows
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
|
@ -78,7 +85,7 @@ jobs:
|
|||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
cx-freeze-msi-release:
|
||||
needs: cx-freeze-msi
|
||||
needs: [cx-freeze-msi, prerelease]
|
||||
name: cx-Freeze msi
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
|
@ -93,7 +100,7 @@ jobs:
|
|||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
cx-freeze-zip-release:
|
||||
needs: cx-freeze-zip
|
||||
needs: [cx-freeze-zip, prerelease]
|
||||
name: cx-Freeze zip
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
|
@ -103,13 +110,13 @@ jobs:
|
|||
|
||||
macos:
|
||||
needs: version
|
||||
name: MacOS
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_macos.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
macos-release:
|
||||
needs: macos
|
||||
name: MacOS
|
||||
needs: [macos, prerelease]
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
|
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
@ -101,13 +101,13 @@ jobs:
|
|||
name1: Rare-Windows-${{ github.ref_name }}.zip
|
||||
|
||||
macos:
|
||||
name: MacOS
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_macos.yml
|
||||
with:
|
||||
version: ${{ github.ref_name }}
|
||||
macos-release:
|
||||
needs: macos
|
||||
name: MacOS
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ github.ref_name }}
|
||||
|
|
71
.github/workflows/snapshot.yml
vendored
71
.github/workflows/snapshot.yml
vendored
|
@ -3,12 +3,17 @@ name: "Snapshot"
|
|||
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
types: [closed]
|
||||
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
|
||||
jobs:
|
||||
|
||||
version:
|
||||
|
@ -22,12 +27,29 @@ jobs:
|
|||
steps:
|
||||
- run: "true"
|
||||
|
||||
prerelease:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: version
|
||||
name: Create pre-release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: "true"
|
||||
|
||||
ubuntu:
|
||||
needs: version
|
||||
name: Ubuntu
|
||||
uses: ./.github/workflows/job_ubuntu.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
ubuntu-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [ubuntu, prerelease]
|
||||
name: Ubuntu
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare.deb
|
||||
name1: Rare-${{ needs.version.outputs.version }}.deb
|
||||
|
||||
appimage:
|
||||
needs: version
|
||||
|
@ -35,6 +57,17 @@ jobs:
|
|||
uses: ./.github/workflows/job_appimage.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
appimage-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [appimage, prerelease]
|
||||
name: AppImage
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare.AppImage
|
||||
name1: Rare-${{ needs.version.outputs.version }}.AppImage
|
||||
file2: Rare.AppImage.zsync
|
||||
name2: Rare-${{ needs.version.outputs.version }}.AppImage.zsync
|
||||
|
||||
nuitka-win:
|
||||
if: ${{ false }}
|
||||
|
@ -43,6 +76,15 @@ jobs:
|
|||
uses: ./.github/workflows/job_nuitka-win.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
nuitka-win-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [nuitka-win, prerelease]
|
||||
name: Nuitka Windows
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare-Windows.zip
|
||||
name1: Rare-Windows-${{ needs.version.outputs.version }}.zip
|
||||
|
||||
cx-freeze-msi:
|
||||
needs: version
|
||||
|
@ -50,6 +92,15 @@ jobs:
|
|||
uses: ./.github/workflows/job_cx-freeze-msi.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
cx-freeze-msi-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [cx-freeze-msi, prerelease]
|
||||
name: cx-Freeze msi
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare.msi
|
||||
name1: Rare-${{ needs.version.outputs.version }}.msi
|
||||
|
||||
cx-freeze-zip:
|
||||
needs: version
|
||||
|
@ -57,11 +108,29 @@ jobs:
|
|||
uses: ./.github/workflows/job_cx-freeze-zip.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
cx-freeze-zip-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [cx-freeze-zip, prerelease]
|
||||
name: cx-Freeze zip
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare-Windows.zip
|
||||
name1: Rare-Windows-${{ needs.version.outputs.version }}.zip
|
||||
|
||||
macos:
|
||||
needs: version
|
||||
name: MacOS
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_macos.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
macos-release:
|
||||
if: ${{ github.event_name == "workflow_dispatch" }}
|
||||
needs: [macos, prerelease]
|
||||
name: macOS
|
||||
uses: ./.github/workflows/job_release.yml
|
||||
with:
|
||||
version: ${{ needs.version.outputs.version }}
|
||||
file1: Rare.dmg
|
||||
name1: Rare-${{ needs.version.outputs.version }}.dmg
|
||||
|
||||
|
|
Loading…
Reference in a new issue