Skip to content

Commit d0f6983

Browse files
clemensvclemensv
committed
Build script fixes
Signed-off-by: Clemens Vasters <clemens@vasters.com>
1 parent 513c699 commit d0f6983

File tree

5 files changed

+29
-32
lines changed

5 files changed

+29
-32
lines changed

‎.github/workflows/main-ci-build.yml‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
jobs:
1414
build:
15+
permissions: write-all
1516
strategy:
1617
matrix:
1718
os: [ubuntu-latest, windows-latest, macos-latest]
@@ -25,21 +26,16 @@ jobs:
2526
mkdir artifacts
2627
mkdir artifacts/build
2728
28-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
2930
with:
3031
fetch-depth: 0 # Mandatory to use the extract version from tag action
3132

3233
- name: Extract version from tag
3334
uses: damienaicheh/extract-version-from-tag-action@v1.0.0
3435

35-
- name: Export version
36-
run: |
37-
echo "VERSIONSUFFIX=${{ env.PRE_RELEASE }}" >> $GITHUB_ENV
38-
echo "PRODVERSION=${{ env.MAJOR }}.${{ env.MINOR }}" >> $GITHUB_ENV
39-
echo "PATCHVERSION=${{ env.PATCH }}" >> $GITHUB_ENV
4036

4137
- name: Setup .NET SDK
42-
uses: actions/setup-dotnet@v1
38+
uses: actions/setup-dotnet@v4
4339
with:
4440
dotnet-version: 8.0.x
4541

@@ -49,30 +45,30 @@ jobs:
4945
- name: Build Docker Image TAR file
5046
run: |
5147
mkdir -p artifacts/build/images
52-
DOCKER_BUILDKIT=1 docker build . --build-arg "REVISION=${{ env.PRODVERSION }}.${{ env.PATCHVERSION }}" --build-arg "VERSION=${{ env.PRODVERSION }}" -t azbridge:${{ env.PRODVERSION }} -t azbridge
53-
docker save azbridge:${{ env.PRODVERSION }} > artifacts/build/images/azbridge-oci-image-${{ env.PRODVERSION }}.${{ env.PATCHVERSION }}.tar
48+
DOCKER_BUILDKIT=1 docker build . --build-arg "REVISION=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}" --build-arg "VERSION=${{ env.MAJOR }}.${{ env.MINOR }}" -t azbridge:${{ env.MAJOR }}.${{ env.MINOR }} -t azbridge
49+
docker save azbridge:${{ env.MAJOR }}.${{ env.MINOR }} > artifacts/build/images/azbridge-oci-image-${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}.tar
5450
if: matrix.os == 'ubuntu-latest'
5551

5652
- name: Build for Windows-x64
57-
run: dotnet msbuild /t:Package /p:WindowsOnly=true /p:RuntimeIdentifier=win-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
53+
run: dotnet msbuild /t:Package /p:WindowsOnly=true /p:RuntimeIdentifier=win-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
5854
if: matrix.os == 'windows-latest'
5955
- name: Build for Windows-arm64
60-
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
56+
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
6157
if: matrix.os == 'windows-latest'
6258
- name: Build for Windows-x86
63-
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-x86 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
59+
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=win-x86 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
6460
if: matrix.os == 'windows-latest'
6561
- name: Build for macOS-x64
66-
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
62+
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
6763
if: matrix.os == 'macos-latest'
6864
- name: Build for macOS-arm64
69-
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
65+
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=osx-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
7066
if: matrix.os == 'macos-latest'
7167
- name: Build for Linux-x64
72-
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
68+
run: dotnet msbuild /t:Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-x64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
7369
if: matrix.os == 'ubuntu-latest'
7470
- name: Build for Linux-arm64
75-
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel
71+
run: dotnet msbuild /t:Restore,Package /p:WindowsOnly=false /p:RuntimeIdentifier=linux-arm64 /p:Configuration=Release /p:TargetFramework=net8.0 /p:VersionSuffix=rel /p:VersionPrefix=${{ env.MAJOR }}.${{ env.MINOR }}.${{ env.PATCH }}
7672
if: matrix.os == 'ubuntu-latest'
7773

7874
- name: Unit Test Windows x64
@@ -95,28 +91,28 @@ jobs:
9591
dotnet test /p:TargetFramework=net8.0 /p:RuntimeIdentifier=osx-arm64 /p:Configuration=Debug
9692
if: matrix.os == 'macos-latest'
9793

98-
- uses: actions/upload-artifact@v2
94+
- uses: actions/upload-artifact@v3
9995
with:
10096
name: XBuild
10197
path: artifacts/build/net8.0
10298

103-
- uses: actions/upload-artifact@v2
99+
- uses: actions/upload-artifact@v3
104100
with:
105101
name: XBuild
106102
path: artifacts/build/images
107103
if: matrix.os == 'ubuntu-latest'
108104

109-
- name: Integration Tests Docker/Linux
110-
env:
111-
AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
112-
run: bash ./verify-build.sh
113-
if: matrix.os == 'ubuntu-latest'
105+
#- name: Integration Tests Docker/Linux
106+
# env:
107+
# AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
108+
# run: bash ./verify-build.sh
109+
# if: matrix.os == 'ubuntu-latest'
114110

115-
- name: Integration Tests Windows
116-
env:
117-
AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
118-
run: ./verify-build.cmd
119-
if: matrix.os == 'windows-latest'
111+
#- name: Integration Tests Windows
112+
# env:
113+
# AZBRIDGE_TEST_CXNSTRING: ${{ secrets.AZBRIDGE_TEST_CXNSTRING }}
114+
# run: ./verify-build.cmd
115+
# if: matrix.os == 'windows-latest'
120116

121117
# create a release if a tag has been pushed
122118
- name: Generate Release

‎build/dependencies.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
66
<PackagingTargetsPackageVersion>0.1.220</PackagingTargetsPackageVersion>
7-
<WixPackageVersion>3.14.0</WixPackageVersion>
7+
<WixPackageVersion>3.14.1</WixPackageVersion>
88
<MicrosoftDiagnosticsTracingEventSourcePackageVersion>1.1.28</MicrosoftDiagnosticsTracingEventSourcePackageVersion>
99
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.66</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
1010
<MicrosoftNETCoreAppPackageVersion>8.0.0</MicrosoftNETCoreAppPackageVersion>

‎src/azbridge-installer/azbridge-installer.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Publish" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\WiX.3.14.0\build\wix.props" Condition="Exists('packages\WiX.3.14.0\build\wix.props')" />
3+
<Import Project="packages\WiX.3.14.1\build\wix.props" Condition="Exists('packages\WiX.3.14.1\build\wix.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<ProductVersion>3.10</ProductVersion>
@@ -98,7 +98,7 @@
9898
<PropertyGroup>
9999
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
100100
</PropertyGroup>
101-
<Error Condition="!Exists('packages\WiX.3.14.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\WiX.3.14.0\build\wix.props'))" />
101+
<Error Condition="!Exists('packages\WiX.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\WiX.3.14.1\build\wix.props'))" />
102102
</Target>
103103
<Target Name="Publish" DependsOnTargets="Build">
104104
</Target>

‎src/azbridge-installer/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="WiX" version="3.14.0" targetFramework="net8.0" />
3+
<package id="WiX" version="3.14.1" targetFramework="net8.0" />
44
</packages>

‎version.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<VersionPrefix Condition="'$(PRODVERSION)'!=''">$(PRODVERSION).$(RunNumber)</VersionPrefix>
88
<VersionSuffix>rel</VersionSuffix>
99
<VersionSuffix Condition="'$(VERSIONSUFFIX)'!=''">$(VERSIONSUFFIX)</VersionSuffix>
10+
<PackageVersion>$(VERSIONPREFIX)</PackageVersion>
1011
</PropertyGroup>
1112
</Project>

0 commit comments

Comments
 (0)