diff --git a/.github/workflows/job_release.yml b/.github/workflows/job_release.yml index 02b46d6c..46e896df 100644 --- a/.github/workflows/job_release.yml +++ b/.github/workflows/job_release.yml @@ -3,6 +3,9 @@ name: job_release on: workflow_call: inputs: + version: + required: true + type: string file1: required: true type: string @@ -30,7 +33,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ inputs.file1 }} asset_name: ${{ inputs.name1 }} - tag: ${{ github.ref }} + tag: ${{ inputs.version }} overwrite: true - name: Download ${{ inputs.name2 }} artifact @@ -45,5 +48,5 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ inputs.file2 }} asset_name: ${{ inputs.name2 }} - tag: ${{ github.ref }} + tag: ${{ inputs.version }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/job_version.yml b/.github/workflows/job_version.yml index b93f5014..a8097c2b 100644 --- a/.github/workflows/job_version.yml +++ b/.github/workflows/job_version.yml @@ -3,14 +3,8 @@ name: job_version on: workflow_call: outputs: - tag_abbrev: - value: ${{ jobs.version.outputs.tag_abbrev }} - tag_offset: - value: ${{ jobs.version.outputs.tag_offset }} - sha_short: - value: ${{ jobs.version.outputs.sha_short }} - full_desc: - value: ${{ jobs.version.outputs.full_desc }} + version: + value: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} branch: value: ${{ jobs.version.outputs.branch }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml new file mode 100644 index 00000000..ddc5aa59 --- /dev/null +++ b/.github/workflows/prerelease.yml @@ -0,0 +1,118 @@ + +name: "Prerelease" + + +on: + workflow_dispatch: + + +permissions: + contents: write + + +jobs: + + version: + name: Describe + uses: ./.github/workflows/job_version.yml + + title: + needs: version + name: Version ${{ needs.version.outputs.version }} + 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: + needs: ubuntu + 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 + name: AppImage + uses: ./.github/workflows/job_appimage.yml + with: + version: ${{ needs.version.outputs.version }} + appimage-release: + needs: appimage + 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 }} + needs: version + name: Nuitka Windows + uses: ./.github/workflows/job_nuitka-win.yml + with: + version: ${{ needs.version.outputs.version }} + nuitka-win-release: + needs: nuitka-win + 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 + name: cx-Freeze msi + uses: ./.github/workflows/job_cx-freeze-msi.yml + with: + version: ${{ needs.version.outputs.version }} + cx-freeze-msi-release: + needs: cx-freeze-msi + 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 + name: cx-Freeze zip + uses: ./.github/workflows/job_cx-freeze-zip.yml + with: + version: ${{ needs.version.outputs.version }} + cx-freeze-zip-release: + needs: cx-freeze-zip + 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 + uses: ./.github/workflows/job_macos.yml + with: + version: ${{ needs.version.outputs.version }} + macos-release: + needs: macos + name: MacOS + uses: ./.github/workflows/job_release.yml + with: + version: ${{ needs.version.outputs.version }} + file1: Rare.dmg + name1: Rare-${{ needs.version.outputs.version }}.dmg + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85cb918e..ce1d4a23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,7 @@ jobs: name: Ubuntu uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.deb name1: Rare-${{ github.ref_name }}.deb @@ -50,6 +51,7 @@ jobs: name: AppImage uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.AppImage name1: Rare-${{ github.ref_name }}.AppImage file2: Rare.AppImage.zsync @@ -66,6 +68,7 @@ jobs: name: Nuitka Windows uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare-Windows.zip name1: Rare-Windows-${{ github.ref_name }}.zip @@ -79,6 +82,7 @@ jobs: name: cx-Freeze msi uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.msi name1: Rare-${{ github.ref_name }}.msi @@ -92,6 +96,7 @@ jobs: name: cx-Freeze zip uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare-Windows.zip name1: Rare-Windows-${{ github.ref_name }}.zip @@ -105,6 +110,7 @@ jobs: name: MacOS uses: ./.github/workflows/job_release.yml with: + version: ${{ github.ref_name }} file1: Rare.dmg name1: Rare-${{ github.ref_name }}.dmg diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6e6020b4..41e434f1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,7 +3,6 @@ name: "Snapshot" on: - workflow_dispatch: pull_request: branches: - main @@ -18,7 +17,7 @@ jobs: title: needs: version - name: Version ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + name: Version ${{ needs.version.outputs.version }} runs-on: ubuntu-latest steps: - run: "true" @@ -28,14 +27,14 @@ jobs: name: Ubuntu uses: ./.github/workflows/job_ubuntu.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} appimage: needs: version name: AppImage uses: ./.github/workflows/job_appimage.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} nuitka-win: if: ${{ false }} @@ -43,26 +42,26 @@ jobs: name: Nuitka Windows uses: ./.github/workflows/job_nuitka-win.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} cx-freeze-msi: needs: version name: cx-Freeze msi uses: ./.github/workflows/job_cx-freeze-msi.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} cx-freeze-zip: needs: version name: cx-Freeze zip uses: ./.github/workflows/job_cx-freeze-zip.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }} macos: needs: version name: MacOS uses: ./.github/workflows/job_macos.yml with: - version: ${{ needs.version.outputs.tag_abbrev }}.${{ needs.version.outputs.tag_offset }} + version: ${{ needs.version.outputs.version }}