From 72fe4744c09c147ef3f41ea14703b3b441df0c54 Mon Sep 17 00:00:00 2001 From: mpmxyz Date: Sat, 16 Dec 2023 21:57:36 +0100 Subject: [PATCH] added semversion check, version bump --- .github/workflows/build-monkey.yml | 1 - .github/workflows/create-release.yml | 15 ++++++++++++++- SampleMod.csproj | 2 +- SampleModRML.cs | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-monkey.yml b/.github/workflows/build-monkey.yml index f887361..c5386ff 100644 --- a/.github/workflows/build-monkey.yml +++ b/.github/workflows/build-monkey.yml @@ -85,7 +85,6 @@ jobs: ASSEMBLY_NAME: "" - name: Test run: | - mono --version dotnet test --no-restore --configuration "Release" "${{ env.TEST_PROJECT_FILE }}" dotnet test --no-restore --configuration "Debug" "${{ env.MOD_LOADER_TEST_PROJECT_FILE }}" env: diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 9105ebe..675e56d 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -12,11 +12,11 @@ on: type: string required: false description: "Title" + default: "" description: type: string required: true description: "Description of changes" - default: "" release-rml: type: boolean required: false @@ -33,9 +33,21 @@ env: RML_MANIFEST_TOKEN: "${{ secrets.RML_MANIFEST_TOKEN }}" name: "Create Release" jobs: + check-inputs: + runs-on: ubuntu-latest + steps: + - name: "Check version format" + env: + RELEASE_VERSION: "${{ inputs.version }}" + shell: bash + run: | + # https://semver.org/ applied to https://stackoverflow.com/questions/21112707/check-if-a-string-matches-a-regex-in-bash-script + [[ "$RELEASE_VERSION" =~ ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-((0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]] + compile-rml: if: ${{ inputs.release-rml }} uses: ./.github/workflows/build-rml.yml + needs: check-inputs with: RELEASE_VERSION: "${{ inputs.version }}" RELEASE_NOTES: "${{ inputs.description }}" @@ -44,6 +56,7 @@ jobs: compile-monkey: if: ${{ inputs.release-monkey }} uses: ./.github/workflows/build-monkey.yml + needs: check-inputs with: RELEASE_VERSION: "${{ inputs.version }}" RELEASE_NOTES: "${{ inputs.description }}" diff --git a/SampleMod.csproj b/SampleMod.csproj index 185358b..bc5a5fd 100644 --- a/SampleMod.csproj +++ b/SampleMod.csproj @@ -10,7 +10,7 @@ SampleMod A sample Resonite Mod CC0 - 1.0.4 + 1.1.0 $(PROJECT_URL) $(RELEASE_NOTES) Resonite diff --git a/SampleModRML.cs b/SampleModRML.cs index 3681af8..bdf29b1 100644 --- a/SampleModRML.cs +++ b/SampleModRML.cs @@ -9,7 +9,7 @@ public class SampleModRML : ResoniteMod, ISampleMod { public override string Name => "SampleMod"; public override string Author => "mpmxyz"; - public override string Version => "1.0.4"; //Version of the mod, should match the AssemblyVersion + public override string Version => "1.1.0"; //Version of the mod, should match the AssemblyVersion public override string Link => "https://github.com/mpmxyz/ResoniteSampleMod";