Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ubuntu to matrix build

Browse Source
This commit is contained in:
Caelan Sayler
2024-01-10 23:20:43 +00:00
parent 9f89aee865
commit fc9b742331
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build.yml vendored
View File

@@ -9,7 +9,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
os: [macos-latest, windows-latest] os: [macos-latest, windows-latest, ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Print dotnet version - name: Print dotnet version
@@ -33,8 +33,7 @@ jobs:
with: with:
path: ~/.nuget/packages path: ~/.nuget/packages
key: ${{ runner.os }}-test-nuget-${{ hashFiles('**/packages.lock.json') }} key: ${{ runner.os }}-test-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: | restore-keys: ${{ runner.os }}-test-nuget-
${{ runner.os }}-test-nuget-
- name: Install cargo-llvm-cov - name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov
@@ -49,22 +48,31 @@ jobs:
- name: Set Windows Feature - name: Set Windows Feature
shell: pwsh shell: pwsh
run: Add-Content -Path $env:GITHUB_ENV -Value "rust_features=--features windows" run: Add-Content -Path $env:GITHUB_ENV -Value "EXTRA_RUST_FLAGS=--features windows"
if: ${{ matrix.os == 'windows-latest' }} if: ${{ matrix.os == 'windows-latest' }}
- name: Set Linux Target
run: echo "EXTRA_RUST_FLAGS=--target x86_64-unknown-linux-gnu" >> "$GITHUB_ENV"
if: ${{ matrix.os == 'ubuntu-latest' }}
- name: Build Rust - name: Build Rust
working-directory: src/Rust working-directory: src/Rust
run: cargo build --release ${{ env.rust_features }} run: cargo build --release ${{ env.EXTRA_RUST_FLAGS }}
- name: Test Rust - name: Test Rust
working-directory: src/Rust working-directory: src/Rust
run: cargo llvm-cov ${{ env.rust_features }} --cobertura --output-path ../../test/coverage.rust.${{ matrix.os }}.xml run: cargo llvm-cov ${{ env.EXTRA_RUST_FLAGS }} --cobertura --output-path ../../test/coverage.rust.${{ matrix.os }}.xml
- name: Rename OSX Binary - name: Rename OSX Binary
working-directory: src/Rust/target/release working-directory: src/Rust/target/release
run: cp update updatemac run: cp update UpdateMac
if: ${{ matrix.os == 'macos-latest' }} if: ${{ matrix.os == 'macos-latest' }}
- name: Rename Linux Binary
working-directory: src/Rust/target/release
run: cp update UpdateNix
if: ${{ matrix.os == 'ubuntu-latest' }}
- name: Build .NET - name: Build .NET
run: dotnet build -c Release run: dotnet build -c Release
@@ -82,7 +90,8 @@ jobs:
with: with:
name: rust-${{ matrix.os }} name: rust-${{ matrix.os }}
path: | path: |
src/Rust/target/release/updatemac src/Rust/target/release/UpdateNix
src/Rust/target/release/UpdateMac
src/Rust/target/release/*.exe src/Rust/target/release/*.exe
- name: Upload Coverage to Codecov - name: Upload Coverage to Codecov
@@ -108,8 +117,7 @@ jobs:
with: with:
path: ~/.nuget/packages path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: | restore-keys: ${{ runner.os }}-nuget-
${{ runner.os }}-nuget-
- name: Download Rust Windows - name: Download Rust Windows
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@@ -123,6 +131,12 @@ jobs:
name: rust-windows-latest name: rust-windows-latest
path: src/Rust/target/release path: src/Rust/target/release
- name: Download Rust Linux
uses: actions/download-artifact@v4
with:
name: rust-ubuntu-latest
path: src/Rust/target/release
- name: Build .NET - name: Build .NET
run: dotnet build -c Release /p:PackRustAssets=true run: dotnet build -c Release /p:PackRustAssets=true

8
src/Velopack.Vpk/Velopack.Vpk.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable> <IsPackable>true</IsPackable>
<AssemblyName>vpk</AssemblyName> <AssemblyName>vpk</AssemblyName>
<PackageId>vpk</PackageId> <PackageId>vpk</PackageId>
@@ -37,10 +37,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(PackRustAssets)' == 'true'"> <ItemGroup Condition="'$(PackRustAssets)' == 'true'">
<None Include="..\Rust\target\release\updatemac" Pack="true" PackagePath="vendor" /> <None Include="..\Rust\target\release\UpdateMac" Pack="true" PackagePath="vendor" />
<None Include="..\Rust\target\release\UpdateNix" Pack="true" PackagePath="vendor" />
<None Include="..\Rust\target\release\update.exe" Pack="true" PackagePath="vendor" /> <None Include="..\Rust\target\release\update.exe" Pack="true" PackagePath="vendor" />
<None Include="..\Rust\target\release\setup.exe" Pack="true" PackagePath="vendor" /> <None Include="..\Rust\target\release\setup.exe" Pack="true" PackagePath="vendor" />
<None Include="..\Rust\target\release\stub.exe" Pack="true" PackagePath="vendor" /> <None Include="..\Rust\target\release\stub.exe" Pack="true" PackagePath="vendor" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\vendor\appimagetool-x86_64.AppImage" Pack="true" PackagePath="vendor" /> <None Include="..\..\vendor\appimagetool-x86_64.AppImage" Pack="true" PackagePath="vendor" />
<None Include="..\..\vendor\rcedit.exe" Pack="true" PackagePath="vendor" /> <None Include="..\..\vendor\rcedit.exe" Pack="true" PackagePath="vendor" />
<None Include="..\..\vendor\zstd.exe" Pack="true" PackagePath="vendor" /> <None Include="..\..\vendor\zstd.exe" Pack="true" PackagePath="vendor" />