Skip to content

Commit

Permalink
Use three numbered version
Browse files Browse the repository at this point in the history
(References: #109)
  • Loading branch information
Aszusz committed Feb 9, 2024
1 parent 5cb3d5d commit 63b9271
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/man-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ on:
env:
app_name: ${{ inputs.env == 'Production' && 'SuperHumanInstaller' || 'SuperHumanInstallerDev' }}
app_id: net.prominic.genesis.${{ inputs.env == 'Production' && 'superhumaninstaller' || 'superhumaninstallerdev' }}
full_version: ${{ inputs.version }}.${{ github.run_number }}
tag: v${{ inputs.version }}${{ inputs.env == 'Production' && ' ' || '-dev' }}

jobs:
Expand Down Expand Up @@ -64,7 +63,7 @@ jobs:
run: |
echo "Ref: ${{ github.ref_name }}"
echo "Env: ${{ inputs.env }}"
echo "Version: ${{ env.full_version }}"
echo "Version: ${{ inputs.version }}"
echo "App Name: ${{ env.app_name }}"
echo "App ID: ${{ env.app_id }}"
echo "Tag: ${{ env.tag }}"
Expand Down Expand Up @@ -102,7 +101,7 @@ jobs:
json: |
{
"workflow": "development",
"version": "${{ env.full_version }}",
"version": "${{ inputs.version }}",
"branch": "${{ github.ref_name }}",
"commit_sha": "${{ github.sha }}",
"build_date": "${{ steps.current-time.outputs.readableTime }}"
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/sub-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ on:
env:
app_name: ${{ inputs.env == 'Production' && 'SuperHumanInstaller' || 'SuperHumanInstallerDev' }}
app_id: net.prominic.genesis.${{ inputs.env == 'Production' && 'superhumaninstaller' || 'superhumaninstallerdev' }}
full_version: ${{ inputs.version }}.${{ github.run_number }}
haxe_flag: ${{ inputs.env == 'Production' && '-final' || '-debug' }}
haxe_version: 4.3.3
bin_path: Export/${{ inputs.env }}/linux/bin
Expand All @@ -53,7 +52,7 @@ jobs:
run: |
echo "Ref: ${{ github.ref_name }}"
echo "Env: ${{ inputs.env }}"
echo "Version: ${{ env.full_version }}"
echo "Version: ${{ inputs.version }}"
echo "App Name: ${{ env.app_name }}"
echo "App ID: ${{ env.app_id }}"
echo "Haxe Env Flag: ${{ env.haxe_flag }}"
Expand All @@ -71,7 +70,7 @@ jobs:
with:
filepath: "project.xml"
xpath: "/project/meta/@version"
replace: "${{ env.full_version }}"
replace: "${{ inputs.version }}"

- name: Install missing system dependencies
run: |
Expand Down Expand Up @@ -145,7 +144,7 @@ jobs:
uses: Moonshine-IDE/create-appimage-action@main
with:
app-name: ${{ env.app_name }}
app-version: ${{ env.full_version }}
app-version: ${{ inputs.version }}
app-icon-name: icon
app-categories: Utility
bin-paths: ${{ env.bin_path }}/*
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/sub-build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ on:
env:
app_name: ${{ inputs.env == 'Production' && 'SuperHumanInstaller' || 'SuperHumanInstallerDev' }}
app_id: net.prominic.genesis.${{ inputs.env == 'Production' && 'superhumaninstaller' || 'superhumaninstallerdev' }}
full_version: ${{ inputs.version }}.${{ github.run_number }}
haxe_flag: ${{ inputs.env == 'Production' && '-final' || '-debug' }}
haxe_version: 4.3.3
bin_path: Export/${{ inputs.env }}/macos/bin/
Expand All @@ -53,7 +52,7 @@ jobs:
run: |
echo "Ref: ${{ github.ref_name }}"
echo "Env: ${{ inputs.env }}"
echo "Version: ${{ env.full_version }}"
echo "Version: ${{ inputs.version }}"
echo "App Name: ${{ env.app_name }}"
echo "App ID: ${{ env.app_id }}"
echo "Haxe Env Flag: ${{ env.haxe_flag }}"
Expand All @@ -71,7 +70,7 @@ jobs:
with:
filepath: "project.xml"
xpath: "/project/meta/@version"
replace: "${{ env.full_version }}"
replace: "${{ inputs.version }}"

- name: Set up Haxe
uses: krdlab/[email protected]
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/sub-build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ on:
env:
app_name: ${{ inputs.env == 'Production' && 'SuperHumanInstaller' || 'SuperHumanInstallerDev' }}
app_id: net.prominic.genesis.${{ inputs.env == 'Production' && 'superhumaninstaller' || 'superhumaninstallerdev' }}
full_version: ${{ inputs.version }}.${{ github.run_number }}
haxe_flag: ${{ inputs.env == 'Production' && '-final' || '-debug' }}
haxe_version: 4.3.3
bin_path: Export/${{ inputs.env }}/windows/bin/
Expand All @@ -53,7 +52,7 @@ jobs:
run: |
echo "Ref: ${{ github.ref_name }}"
echo "Env: ${{ inputs.env }}"
echo "Version: ${{ env.full_version }}"
echo "Version: ${{ inputs.version }}"
echo "App Name: ${{ env.app_name }}"
echo "App ID: ${{ env.app_id }}"
echo "Haxe Env Flag: ${{ env.haxe_flag }}"
Expand All @@ -71,7 +70,7 @@ jobs:
with:
filepath: "project.xml"
xpath: "/project/meta/@version"
replace: "${{ env.full_version }}"
replace: "${{ inputs.version }}"

- name: Set up Haxe
uses: krdlab/[email protected]
Expand Down Expand Up @@ -134,7 +133,7 @@ jobs:
run: >
makensis
/DPRODUCT_NAME=${{ env.app_name }}
/DPRODUCT_VERSION=${{ env.full_version }}
/DPRODUCT_VERSION=${{ inputs.version }}
/DPRODUCT_PUBLISHER="Prominic.NET"
/DPRODUCT_WEB_SITE="/https://superhumaninstaller.com/"
/DBIN_PATH="..\..\${{ env.bin_path }}\*.*"
Expand Down

0 comments on commit 63b9271

Please sign in to comment.