fixed MonkeyLoader tests, added SemVer check for releases (#32)

mpmxyz · Dec 16, 2023 · e5a1ff3 · e5a1ff3
1 parent 599c7a1
commit e5a1ff3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git 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
@@ -30,12 +30,23 @@ on:
 env:
   NUGET_PUBLISH_TARGET: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
   ARTIFACT_NAME: SampleMod
-  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 +55,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
@@ -10,7 +10,7 @@
     <Product>SampleMod</Product>
     <Description>A sample Resonite Mod</Description>
     <Copyright>CC0</Copyright>
-    <Version>1.0.4</Version>
+    <Version>1.1.0</Version>
     <PackageProjectUrl>$(PROJECT_URL)</PackageProjectUrl>
     <PackageReleaseNotes>$(RELEASE_NOTES)</PackageReleaseNotes>
     <PackageTags>Resonite</PackageTags>

diff --git 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";
 
 

diff --git a/TestMonkey/TestMonkey.csproj b/TestMonkey/TestMonkey.csproj
@@ -44,6 +44,9 @@
 		<Compile Remove="obj\Common\Release\net472\TestMonkey.AssemblyInfo.cs" />
 	</ItemGroup>
 	<ItemGroup>
+		<Reference Include="Harmony">
+			<HintPath>$(ResonitePath)\0Harmony.dll</HintPath>
+		</Reference>
 		<Reference Include="MonkeyLoader">
 			<HintPath>$(ResonitePath)\MonkeyLoader.dll</HintPath>
 		</Reference>

diff --git a/TestRML/TestRML.csproj b/TestRML/TestRML.csproj
@@ -47,6 +47,12 @@
 		<Folder Include="Properties\" />
 	</ItemGroup>
 	<ItemGroup>
+		<Reference Include="Harmony">
+			<HintPath>$(ResonitePath)\rml_libs\0Harmony.dll</HintPath>
+		</Reference>
+		<Reference Include="ResoniteModLoader">
+			<HintPath>$(ResonitePath)\Libraries\ResoniteModLoader.dll</HintPath>
+		</Reference>
 		<ProjectReference Include="..\SampleModRML.csproj" />
 	</ItemGroup>
 </Project>