From f55c6cfaebf3639558b0dd8c5c5524d42711de69 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Thu, 13 Oct 2022 20:07:34 +0400
Subject: Workflow

---
 .github/workflows/build-test.yml | 12 +-----------
 .github/workflows/release.yml    |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d195082..246d43a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -26,10 +26,8 @@ jobs:
     env:
       APP_NAME: nestiler
       PROJECT_PATH: ./NesTiler
-      TESTS_PATH: ./Tests
       OUTPUT_DIR: output
       CONFIGURATION: Release
-      TESTS_CONFIGURATION: Debug
       OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
     steps:
     - name: Checkout
@@ -43,15 +41,7 @@ jobs:
     - name: Build
       env:
         SC_OPS: ${{ matrix.sc == 'self-contained' && '--self-contained true -p:PublishTrimmed=True' || '--no-self-contained' }}
-      run: dotnet publish ${{ env.PROJECT_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true $SC_OPS -p:IncludeAllContentForSelfExtract=true -o ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}/${{ env.APP_NAME }}
-    - name: Tests
-      if: |
-        (matrix.host == 'ubuntu-latest' && matrix.os == 'linux' && matrix.arch != 'arm') 
-        || (matrix.host == 'macos-latest' && matrix.os == 'osx' && matrix.arch != 'arm')
-        || (matrix.host == 'windows-latest' && matrix.os == 'win' && matrix.arch != 'arm')
-      env:
-        SC_OPS: ${{ matrix.sc == 'self-contained' && '--self-contained true -p:PublishTrimmed=True' || '--no-self-contained' }}
-      run: dotnet test ${{ env.TESTS_PATH }} -c ${{ env.TESTS_CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true $SC_OPS -p:IncludeAllContentForSelfExtract=true
+      run: dotnet publish ${{ env.PROJECT_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true {{ env.SC_OPS }} -o ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}/${{ env.APP_NAME }}
     - name: Upload artifact
       if: |
         (matrix.host == 'ubuntu-latest' && matrix.os == 'linux') 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 454b3cb..599fc17 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       APP_NAME: nestiler
-      PROJECT_PATH: .
+      PROJECT_PATH: NesTiler
       OUTPUT_DIR: output
       CONFIGURATION: Release
       OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
@@ -59,7 +59,7 @@ jobs:
     - name: Build
       env:
         SC_OPS: ${{ matrix.sc == 'self-contained' && '--self-contained true -p:PublishTrimmed=True' || '--no-self-contained' }}
-      run: dotnet publish ${{ env.PROJECT_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true $SC_OPS -p:IncludeAllContentForSelfExtract=true -o ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}/${{ env.APP_NAME }}
+      run: dotnet publish ${{ env.PROJECT_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true {{ env.SC_OPS }} -o ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}/${{ env.APP_NAME }}
     - name: Simple test
       if: |
         (matrix.host == 'ubuntu-latest' && matrix.os == 'linux' && matrix.arch != 'arm') 
-- 
cgit v1.2.3