From 0f3bf93517ccd8b5cad7be3078fd58a1e2156439 Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:12:08 +0200 Subject: [PATCH 1/8] Update oneware-extension.json --- oneware-extension.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oneware-extension.json b/oneware-extension.json index cfe1c23..80a85f0 100644 --- a/oneware-extension.json +++ b/oneware-extension.json @@ -42,6 +42,10 @@ { "target": "osx-x64", "url": "https://github.com/ProtopSolutions/OneWare.GhdlExtension/releases/download/0.12.0.2/OneWare_GhdlExtension_0.12.0.2_osx-x64.zip" + }, + { + "target": "osx-arm64", + "url": "https://github.com/ProtopSolutions/OneWare.GhdlExtension/releases/download/0.12.0.2/OneWare_GhdlExtension_0.12.0.2_osx-x64.zip" } ] } From 33950ad4742e90b351c63628057202a3a70bface Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:30:07 +0200 Subject: [PATCH 2/8] Update oneware-extension.json --- oneware-extension.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oneware-extension.json b/oneware-extension.json index 80a85f0..e813968 100644 --- a/oneware-extension.json +++ b/oneware-extension.json @@ -45,7 +45,7 @@ }, { "target": "osx-arm64", - "url": "https://github.com/ProtopSolutions/OneWare.GhdlExtension/releases/download/0.12.0.2/OneWare_GhdlExtension_0.12.0.2_osx-x64.zip" + "url": "https://github.com/ProtopSolutions/OneWare.GhdlExtension/releases/download/0.12.0.2/OneWare_GhdlExtension_0.12.0.2_osx-arm64.zip" } ] } From 7ea0027b99a2bee4bdeffe13c3721aaff4d4b0e5 Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:43:15 +0200 Subject: [PATCH 3/8] Update publish.yml --- .github/workflows/publish.yml | 53 +++++++++-------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 46ecf18..a538c3d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,9 +11,12 @@ on: jobs: build: - + strategy: + matrix: + target: ["win-x64", "linux-x64", "osx-x64", "osx-arm64"] + runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v3 with: @@ -22,30 +25,20 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0.x - - name: Build Windows-x64 - run: dotnet build OneWare.Ghdl/OneWare.Ghdl.csproj -c Release -r win-x64 -o publish-win-x64 - - uses: actions/upload-artifact@v3 + - name: Build ${{ matrix.target }} + run: dotnet build OneWare.Ghdl/OneWare.Ghdl.csproj -c Release -r ${{ matrix.target }} -o publish + - name: Compress ${{ matrix.target }} + uses: thedoctor0/zip-release@0.7.1 with: - name: OneWare_GhdlExtension_win-x64 - if-no-files-found: error - retention-days: 7 - path: ./publish-win-x64 - - name: Build Linux-x64 - run: dotnet build OneWare.Ghdl/OneWare.Ghdl.csproj -c Release -r linux-x64 -o publish-linux-x64 + type: 'zip' + filename: ../OneWare_GhdlExtension_${{steps.get-version.outputs.version}}_${{ matrix.target }}.zip + directory: ./publish - uses: actions/upload-artifact@v3 with: - name: OneWare_GhdlExtension_linux-x64 + name: OneWare_GhdlExtension_${{ matrix.target }}.zip if-no-files-found: error retention-days: 7 - path: ./publish-linux-x64 - - name: Build osx-x64 - run: dotnet build OneWare.Ghdl/OneWare.Ghdl.csproj -c Release -r osx-x64 -o publish-osx-x64 - - uses: actions/upload-artifact@v3 - with: - name: OneWare_GhdlExtension_osx-x64 - if-no-files-found: error - retention-days: 7 - path: ./publish-osx-x64 + path: ./ release: runs-on: ubuntu-latest @@ -62,24 +55,6 @@ jobs: - uses: actions/download-artifact@v3 with: path: ./artifacts - - name: Archive Release Win-x64 - uses: thedoctor0/zip-release@0.7.1 - with: - type: 'zip' - filename: ../OneWare_GhdlExtension_${{steps.get-version.outputs.version}}_win-x64.zip - directory: ./artifacts/OneWare_GhdlExtension_win-x64 - - name: Archive Release Linux-x64 - uses: thedoctor0/zip-release@0.7.1 - with: - type: 'zip' - filename: ../OneWare_GhdlExtension_${{steps.get-version.outputs.version}}_linux-x64.zip - directory: ./artifacts/OneWare_GhdlExtension_linux-x64 - - name: Archive Release Osx-x64 - uses: thedoctor0/zip-release@0.7.1 - with: - type: 'zip' - filename: ../OneWare_GhdlExtension_${{steps.get-version.outputs.version}}_osx-x64.zip - directory: ./artifacts/OneWare_GhdlExtension_osx-x64 - uses: ncipollo/release-action@v1 with: artifacts: "artifacts/**.zip" From e890606752c2ef344d074d577f3df259a9c445c2 Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:48:34 +0200 Subject: [PATCH 4/8] Update publish.yml --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a538c3d..32967ec 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,10 +35,10 @@ jobs: directory: ./publish - uses: actions/upload-artifact@v3 with: - name: OneWare_GhdlExtension_${{ matrix.target }}.zip + name: OneWare_GhdlExtension_${{ matrix.target }} if-no-files-found: error retention-days: 7 - path: ./ + path: ./OneWare_GhdlExtension_${{steps.get-version.outputs.version}}_${{ matrix.target }}.zip release: runs-on: ubuntu-latest From 0fd90612b1e6a6f9105c1979ee2deecac5322b4d Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:49:52 +0200 Subject: [PATCH 5/8] Update publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 32967ec..d757023 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,7 +57,7 @@ jobs: path: ./artifacts - uses: ncipollo/release-action@v1 with: - artifacts: "artifacts/**.zip" + artifacts: "artifacts/**/*.zip" tag: ${{steps.get-version.outputs.version}} allowUpdates: true From 1eefb06b9a9ffeb3ae5b1679c95248f445837ac7 Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 01:54:37 +0200 Subject: [PATCH 6/8] Update publish.yml --- .github/workflows/publish.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d757023..bae7334 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,7 +24,12 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 7.0.x + - name: Get Version + uses: kzrnm/get-net-sdk-project-versions-action@v1.3.0 + id: get-version + with: + proj-path: OneWare.Ghdl/OneWare.Ghdl.csproj - name: Build ${{ matrix.target }} run: dotnet build OneWare.Ghdl/OneWare.Ghdl.csproj -c Release -r ${{ matrix.target }} -o publish - name: Compress ${{ matrix.target }} @@ -47,7 +52,7 @@ jobs: needs: [ build ] steps: - uses: actions/checkout@v3 - - name: get-net-sdk-project-versions-action + - name: Get Version uses: kzrnm/get-net-sdk-project-versions-action@v1.3.0 id: get-version with: From 63858627fd3e2d01a8e4f5083f7730cd4d6978d5 Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 02:08:34 +0200 Subject: [PATCH 7/8] Update OneWare.Ghdl.csproj --- OneWare.Ghdl/OneWare.Ghdl.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OneWare.Ghdl/OneWare.Ghdl.csproj b/OneWare.Ghdl/OneWare.Ghdl.csproj index f0f218d..ddab3f0 100644 --- a/OneWare.Ghdl/OneWare.Ghdl.csproj +++ b/OneWare.Ghdl/OneWare.Ghdl.csproj @@ -25,7 +25,12 @@ https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-gha-ubuntu-20.04-mcode.tgz - + + osx-x64 + https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-macos-11-mcode.tgz + + + osx-x64 https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-macos-11-mcode.tgz From ee98026776d54dac2c7bf46a9954eff11d38425b Mon Sep 17 00:00:00 2001 From: Hendrik Mennen Date: Fri, 11 Aug 2023 02:17:47 +0200 Subject: [PATCH 8/8] fix --- OneWare.Ghdl/OneWare.Ghdl.csproj | 6 +++--- OneWare.Ghdl/Services/GhdlService.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OneWare.Ghdl/OneWare.Ghdl.csproj b/OneWare.Ghdl/OneWare.Ghdl.csproj index ddab3f0..c98f7f1 100644 --- a/OneWare.Ghdl/OneWare.Ghdl.csproj +++ b/OneWare.Ghdl/OneWare.Ghdl.csproj @@ -25,13 +25,13 @@ https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-gha-ubuntu-20.04-mcode.tgz - + osx-x64 https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-macos-11-mcode.tgz - - osx-x64 + + osx-arm64 https://github.com/ghdl/ghdl/releases/download/v3.0.0/ghdl-macos-11-mcode.tgz diff --git a/OneWare.Ghdl/Services/GhdlService.cs b/OneWare.Ghdl/Services/GhdlService.cs index 045af2b..3f4e137 100644 --- a/OneWare.Ghdl/Services/GhdlService.cs +++ b/OneWare.Ghdl/Services/GhdlService.cs @@ -51,7 +51,7 @@ private static ProcessStartInfo GetGhdlProcessStartInfo(string workingDirectory, PlatformId.WinX64 => $"{assemblyPath}/native_tools/win-x64/ghdl/GHDL/bin/ghdl.exe", PlatformId.LinuxX64 => $"{assemblyPath}/native_tools/linux-x64/ghdl/GHDL/bin/ghdl", PlatformId.OsxX64 => $"{assemblyPath}/native_tools/osx-x64/ghdl/GHDL/bin/ghdl", - PlatformId.OsxArm64 => $"{assemblyPath}/native_tools/osx-x64/ghdl/GHDL/bin/ghdl", + PlatformId.OsxArm64 => $"{assemblyPath}/native_tools/osx-arm64/ghdl/GHDL/bin/ghdl", _ => null, };