fixed ci (#60)

* fixed ci * Update release.yml Co-authored-by: Arman <[email protected]>
telstrapurple · Jun 24, 2022 · 254a843 · 254a843
1 parent 5661160
commit 254a843
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 197 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -2,67 +2,67 @@ name: .NET Core
 
 on:
   push:
-    branches: [master]
+    branches: [ main ]
   pull_request:
-    branches: [master]
+    branches: [ main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Release --no-restore
-      - name: Test
-        run: dotnet test --no-restore --verbosity normal
-
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+    - name: Test
+      run: dotnet test --no-restore --verbosity normal
+  
   publish:
     needs: build
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     runs-on: macos-latest
+    env:
+      releaseVersion: 0.0.0.${{ github.run_number }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 6.0.x
-      - name: Install dependencies
-        run: dotnet restore
       # Publish osx-x64
       - name: Publish osx-x64
-        run: dotnet publish -r osx-x64 -c Release /p:PublishTrimmed=true
+        run: dotnet publish -r osx-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Archive osx-x64
         uses: actions/upload-artifact@v1
         with:
           name: PurpleExplorer_osx-x64
           path: PurpleExplorer/bin/Release/net6.0/osx-x64/publish
       # Publish osx-arm64
       - name: Publish osx-arm64
-        run: dotnet publish -r osx-arm64 -c Release /p:PublishTrimmed=true
+        run: dotnet publish -r osx-arm64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Archive osx-arm64
         uses: actions/upload-artifact@v1
         with:
           name: PurpleExplorer_osx-arm64
           path: PurpleExplorer/bin/Release/net6.0/osx-arm64/publish
       # Publish win-x64
       - name: Publish win-x64
-        run: dotnet publish -r win-x64 -c Release /p:PublishTrimmed=true
+        run: dotnet publish -r win-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Archive win-x64
         uses: actions/upload-artifact@v1
         with:
           name: PurpleExplorer_win-x64
           path: PurpleExplorer/bin/Release/net6.0/win-x64/publish
       # Publish linux-x64
       - name: Publish linux-x64
-        run: dotnet publish -r linux-x64 -c Release /p:PublishTrimmed=true
+        run: dotnet publish -r linux-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Archive linux-x64
         uses: actions/upload-artifact@v1
         with:
           name: PurpleExplorer_linux-x64
-          path: PurpleExplorer/bin/Release/net6.0/linux-x64/publish
+          path: PurpleExplorer/bin/Release/net6.0/linux-x64/publish
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,14 +5,14 @@ on:
     inputs:
       majorVersion:
         required: true
-        default: "0"
+        default: '0'
       minorVersion:
         required: true
-        default: "1"
+        default: '1'
 
 jobs:
   publish:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     runs-on: macos-latest
     env:
       releaseVersion: ${{ github.event.inputs.majorVersion }}.${{ github.event.inputs.minorVersion }}.${{ github.run_number }}
@@ -24,26 +24,24 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 6.0.x
-      - name: Install dependencies
-        run: dotnet restore
       # Publish osx-x64
       - name: Publish osx-x64
-        run: dotnet publish -r osx-x64 -c Release /p:PublishTrimmed=true /p:Version=${{env.releaseVersion}}
+        run: dotnet publish -r osx-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Zip osx-x64
         run: (cd PurpleExplorer/bin/Release/net6.0/osx-x64/publish ; zip -r PurpleExplorer_osx-x64.zip *)
       # Publish osx-arm64
       - name: Publish osx-arm64
-        run: dotnet publish -r osx-arm64 -c Release /p:PublishTrimmed=true /p:Version=${{env.releaseVersion}}
+        run: dotnet publish -r osx-arm64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Zip osx-arm64
         run: (cd PurpleExplorer/bin/Release/net6.0/osx-arm64/publish ; zip -r PurpleExplorer_osx-arm64.zip *)
       # Publish win-x64
       - name: Publish win-x64
-        run: dotnet publish -r win-x64 -c Release /p:PublishTrimmed=true /p:Version=${{env.releaseVersion}}
+        run: dotnet publish -r win-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Zip win-x64
         run: (cd PurpleExplorer/bin/Release/net6.0/win-x64/publish ; zip -r PurpleExplorer_win-x64 *)
       # Publish linux-x64
       - name: Publish linux-x64
-        run: dotnet publish -r linux-x64 -c Release /p:PublishTrimmed=true /p:Version=${{env.releaseVersion}}
+        run: dotnet publish -r linux-x64 -p:Configuration=Release -p:DebugType=None -p:DebugSymbols=false -p:Version=${{env.releaseVersion}}
       - name: Zip linux-x64
         run: (cd PurpleExplorer/bin/Release/net6.0/linux-x64/publish ; zip -r PurpleExplorer_linux-x64 *)
       # Create release
@@ -96,4 +94,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: PurpleExplorer/bin/Release/net6.0/linux-x64/publish/PurpleExplorer_linux-x64.zip
           asset_name: PurpleExplorer_linux-x64.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip
diff --git a/PurpleExplorer/.github/workflows/dotnet-core.yml b/PurpleExplorer/.github/workflows/dotnet-core.yml
diff --git a/PurpleExplorer/.github/workflows/release.yml b/PurpleExplorer/.github/workflows/release.yml