From 52075f146f887e2adb5ed77fce6e1db9f8fdf699 Mon Sep 17 00:00:00 2001 From: Brandon Stalnaker Date: Fri, 9 Aug 2024 09:34:52 -0400 Subject: [PATCH] Update CI --- .github/workflows/pull-request.yml | 20 ++++++++++---------- .github/workflows/release.yml | 6 +++--- build.sh | 30 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index bc1faa3..041bb90 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -5,28 +5,28 @@ on: jobs: Build: - runs-on: macos-10.15 + runs-on: macOS-13 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Build artifacts run: ./build.sh Android: - runs-on: macos-10.15 + runs-on: macos-13 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Android run: | - nuget restore + dotnet restore cd Samples/mParticle.Xamarin.Android.Sample - msbuild + dotnet build iOS: - runs-on: macos-10.15 + runs-on: macos-13 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: iOS run: | - nuget restore + dotnet restore cd Samples/mParticle.Xamarin.iOS.Sample - msbuild + dotnet build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 376010a..e9688d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Branch name run: | BRANCHNAME=${GITHUB_REF##*/} @@ -29,11 +29,11 @@ jobs: release-to-nuget: name: Release and Sync Repos - runs-on: macos-10.15 + runs-on: macos-13 needs: ['confirm-master-branch'] steps: - name: Git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build artifacts run: ./build.sh - name: Release to Nuget diff --git a/build.sh b/build.sh index 8e13235..b23e13f 100755 --- a/build.sh +++ b/build.sh @@ -1,18 +1,18 @@ -nuget restore -msbuild Bindings/mParticle.Xamarin.AndroidBinding/mParticle.Xamarin.AndroidBinding.csproj /p:Configuration=Release /t:Rebuild -msbuild Bindings/mParticle.Xamarin.iOSBinding/mParticle.Xamarin.iOSBinding.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.Xamarin/mParticle.Xamarin.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.Xamarin.Abstractions/mParticle.Xamarin.Abstractions.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.Xamarin.Android/mParticle.Xamarin.Android.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.Xamarin.iOS/mParticle.Xamarin.iOS.csproj /p:Configuration=Release /t:Rebuild +dotnet restore +dotnet build Bindings/mParticle.Xamarin.AndroidBinding/mParticle.Xamarin.AndroidBinding.csproj +dotnet build Bindings/mParticle.Xamarin.iOSBinding/mParticle.Xamarin.iOSBinding.csproj +dotnet build Library/mParticle.Xamarin/mParticle.Xamarin.csproj +dotnet build Library/mParticle.Xamarin.Abstractions/mParticle.Xamarin.Abstractions.csproj +dotnet build Library/mParticle.Xamarin.Android/mParticle.Xamarin.Android.csproj +dotnet build Library/mParticle.Xamarin.iOS/mParticle.Xamarin.iOS.csproj -msbuild Bindings/mParticle.MAUI.iOSBinding/mParticle.MAUI.iOSBinding.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.MAUI.Abstractions/mParticle.MAUI.Abstractions.csproj /p:Configuration=Release /t:Rebuild -msbuild Library/mParticle.MAUI.iOS/mParticle.MAUI.iOS.csproj /p:Configuration=Release /t:Rebuild +dotnet build Bindings/mParticle.MAUI.iOSBinding/mParticle.MAUI.iOSBinding.csproj +dotnet build Library/mParticle.MAUI.Abstractions/mParticle.MAUI.Abstractions.csproj +dotnet build Library/mParticle.MAUI.iOS/mParticle.MAUI.iOS.csproj -msbuild Samples/mParticle.Xamarin.Android.Sample/mParticle.Xamarin.Android.Sample.csproj /p:Configuration=Debug /t:Rebuild -msbuild Samples/mParticle.Xamarin.Forms.Sample.Droid/mParticle.Xamarin.Forms.Sample.Droid.csproj /p:Configuration=Debug /t:Rebuild -msbuild Samples/mParticle.Xamarin.Forms.Sample.iOS/mParticle.Xamarin.Forms.Sample.iOS.csproj /p:Configuration=Debug /t:Rebuild -msbuild Samples/mParticle.Xamarin.iOS.Sample/mParticle.Xamarin.iOS.Sample.csproj /p:Configuration=Debug /t:Rebuild +dotnet build Samples/mParticle.Xamarin.Android.Sample/mParticle.Xamarin.Android.Sample.csproj +dotnet build Samples/mParticle.Xamarin.Forms.Sample.Droid/mParticle.Xamarin.Forms.Sample.Droid.csproj +dotnet build Samples/mParticle.Xamarin.Forms.Sample.iOS/mParticle.Xamarin.Forms.Sample.iOS.csproj +dotnet build Samples/mParticle.Xamarin.iOS.Sample/mParticle.Xamarin.iOS.Sample.csproj -nuget pack Library/mparticle.nuspec +dotnet pack Library/mparticle.nuspec