From 7a8df7203a45a0153a407344236c8fd73665ca0c Mon Sep 17 00:00:00 2001 From: Jan Wichelmann Date: Mon, 23 Aug 2021 19:32:43 +0200 Subject: [PATCH] Fix solution file, add Pin plugin to workflows --- .github/workflows/build-microwalk.yml | 7 ++----- .github/workflows/release.yml | 7 ++----- Microwalk.sln | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-microwalk.yml b/.github/workflows/build-microwalk.yml index 38c750f..f8058e2 100644 --- a/.github/workflows/build-microwalk.yml +++ b/.github/workflows/build-microwalk.yml @@ -18,11 +18,8 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.x - - name: Install dependencies - run: | - cd Microwalk - dotnet restore - name: Build run: | cd Microwalk - dotnet build --configuration Release --no-restore + dotnet build Microwalk/Microwalk.csproj --configuration Release + dotnet build Microwalk.Plugins.PinTracer/Microwalk.Plugins.PinTracer.csproj --configuration Release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36cd40c..be3ebe1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,14 +28,11 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.x - - name: Install dependencies - run: | - cd Microwalk - dotnet restore - name: Build & Pack run: | cd Microwalk - dotnet publish --configuration Release --no-restore --output publish --no-self-contained + dotnet publish Microwalk/Microwalk.csproj --configuration Release --output publish --no-self-contained + dotnet publish Microwalk.Plugins.PinTracer/Microwalk.Plugins.PinTracer.csproj --configuration Release --output publish --no-self-contained cd publish zip -r Microwalk.zip . - name: Upload asset diff --git a/Microwalk.sln b/Microwalk.sln index a52423c..a43e6f6 100644 --- a/Microwalk.sln +++ b/Microwalk.sln @@ -96,7 +96,7 @@ Global {B6C12179-8A77-49F0-96F9-26CD2DA3FDD8}.Release|x64.ActiveCfg = Release|Any CPU {B6C12179-8A77-49F0-96F9-26CD2DA3FDD8}.Release|x64.Build.0 = Release|Any CPU {B6C12179-8A77-49F0-96F9-26CD2DA3FDD8}.Release|x86.ActiveCfg = Release|Any CPU - {B6C12179-8A77-49F0-96F9-26CD2DA3FDD8}.Release|x86.Build.0 = Release|Any CPUMicrowalk/TracePreprocessing/Modules/PinTraceDumper.cs + {B6C12179-8A77-49F0-96F9-26CD2DA3FDD8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE