From 9e168fea6c33811fc2fb2bb11c61126aba599a5f Mon Sep 17 00:00:00 2001 From: Ben Baron Date: Wed, 23 Mar 2022 11:49:02 -0500 Subject: [PATCH] ci: fix Android builds --- .github/workflows/pull-request.yml | 6 +++--- .github/workflows/release.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index cc4f407..bc1faa3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -5,14 +5,14 @@ on: jobs: Build: - runs-on: macos-latest + runs-on: macos-10.15 steps: - uses: actions/checkout@v1 - name: Build artifacts run: ./build.sh Android: - runs-on: macos-latest + runs-on: macos-10.15 steps: - uses: actions/checkout@v1 - name: Android @@ -22,7 +22,7 @@ jobs: msbuild iOS: - runs-on: macos-latest + runs-on: macos-10.15 steps: - uses: actions/checkout@v1 - name: iOS diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6cc005..376010a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ -# Currently this workflow does not automatically pull in changes from internal or create a git tag or Github "Release". First -# make sure to manually create a release commit in internal/master updating the version number in the `Library/mparticle.nuspec` -# file. Then push internal/master to public/master and run this workflow from public/master to build and release to nuget. -# After it's released to nuget, manually create a tag and "Release" in the public repo pointing to the release commit. +# Currently this workflow does not automatically pull in changes from development or create a git tag or Github "Release". First +# make sure to manually create a release commit in master updating the version number in the `Library/mparticle.nuspec` +# file. Then run this workflow from master to build and release to nuget. After it's released to nuget, manually create a tag +# and Github "Release" in the public repo pointing to the release commit. name: Release SDK @@ -29,7 +29,7 @@ jobs: release-to-nuget: name: Release and Sync Repos - runs-on: macos-latest + runs-on: macos-10.15 needs: ['confirm-master-branch'] steps: - name: Git checkout