workflow edit

smith-chem-wisc · Dec 14, 2024 · 10a08d4 · 10a08d4
1 parent e2b6380
commit 10a08d4
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -53,40 +53,49 @@ jobs:
       run: cd mzLib && dotnet build --no-restore --configuration Release
     - name: Pack
       run: |
-        cd mzLib && nuget pack mzLib.nuspec;
+        cd mzLib;
+        (Get-Content mzLib.nuspec) -replace "\<version\>(.*)\</version\>", "<version>9.9.9<version\> | Set-Content mzLib.nuspec;
         $mzlibMatch = Select-String -Path mzLib.nuspec -Pattern "(?<=\<version\>)(.*)(?=\</version)";
         $mzlibVersion = $mzlibMatch.Matches[0].Value;
-        nuget add "mzLib.$mzlibVersion.nupkg" -Source ../packages
+        echo "mzLib version: $mzlibVersion";
+        dotnet nuget add source ./
     - name: Clone MetaMorpheus
       uses: actions/checkout@master
       with:
         path: ./MetaMorpheus
         repository: smith-chem-wisc/MetaMorpheus 
         ref: master
-    - name: Delete mzLib dependencies
+    - name: Change mzLib to local and restore
       run: |
         cd ./MetaMorpheus/MetaMorpheus;
         dotnet remove CMD package mzLib;
+        dotnet add CMD package mzLib -v 9.9.9;
         dotnet remove GUI package mzLib;
+        dotnet add GUI package mzLib -v 9.9.9;
         dotnet remove GuiFunctions package mzLib;
+        dotnet add GuiFunctions package mzLib -v 9.9.9;
         dotnet remove EngineLayer package mzLib;
+        dotnet add EngineLayer package mzLib -v 9.9.9;
         dotnet remove Test package mzLib;
+        dotnet add Test package mzLib -v 9.9.9;
         dotnet remove TaskLayer package mzLib;
-    - name: Delete mzLib, replace with local
-      run: |
-        cd mzLib;
-        $mzlibMatch = Select-String -Path mzLib.nuspec -Pattern "(?<=\<version\>)(.*)(?=\</version)";
-        $mzlibVersion = $mzlibMatch.Matches[0].Value;
-        echo "mzLib version: $mzlibVersion";
-        cd ../MetaMorpheus/MetaMorpheus;
-        dotnet add CMD package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add CMD package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add GUI package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add GuiFunctions package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add EngineLayer package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add Test package mzLib -v $mzlibVersion -s ../../packages;
-        dotnet add TaskLayer package mzLib -v $mzlibVersion -s ../../packages;
+        dotnet add TaskLayer package mzLib -v 9.9.9;
         dotnet restore;
+    # - name: Delete mzLib, replace with local
+    #   run: |
+    #     cd mzLib;
+    #     $mzlibMatch = Select-String -Path mzLib.nuspec -Pattern "(?<=\<version\>)(.*)(?=\</version)";
+    #     $mzlibVersion = $mzlibMatch.Matches[0].Value;
+    #     echo "mzLib version: $mzlibVersion";
+    #     cd ../MetaMorpheus/MetaMorpheus;
+    #     dotnet add CMD package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add CMD package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add GUI package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add GuiFunctions package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add EngineLayer package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add Test package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet add TaskLayer package mzLib -v $mzlibVersion -s ../../packages;
+    #     dotnet restore;
     - name: Build MetaMorpheus
       run: cd ./MetaMorpheus/MetaMorpheus && dotnet build --no-restore