From e87bd51465b91c6116ad6884b4cd52896e9cf6df Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Wed, 22 Jan 2020 18:50:40 -0500 Subject: [PATCH] Ensures github actions run on pullrequests --- .github/workflows/build.yml | 4 +-- Content/Console/.github/workflows/build.yml | 4 +-- Content/Library/.github/build.yml | 35 --------------------- Content/Library/.github/workflows/build.yml | 4 +-- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 Content/Library/.github/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8bbeb3f..1711c7e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build master -on: [push] +on: [push, pull_request] jobs: build: @@ -10,7 +10,7 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] dotnet: [3.1.100] runs-on: ${{ matrix.os }} - + steps: - uses: actions/checkout@v1 - name: Setup .NET Core diff --git a/Content/Console/.github/workflows/build.yml b/Content/Console/.github/workflows/build.yml index a8bbeb3f..1711c7e6 100644 --- a/Content/Console/.github/workflows/build.yml +++ b/Content/Console/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build master -on: [push] +on: [push, pull_request] jobs: build: @@ -10,7 +10,7 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] dotnet: [3.1.100] runs-on: ${{ matrix.os }} - + steps: - uses: actions/checkout@v1 - name: Setup .NET Core diff --git a/Content/Library/.github/build.yml b/Content/Library/.github/build.yml deleted file mode 100644 index a8bbeb3f..00000000 --- a/Content/Library/.github/build.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build master - -on: [push] - -jobs: - build: - - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - dotnet: [3.1.100] - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ matrix.dotnet }} - - name: Build - if: runner.os != 'Windows' - run: | - chmod +x ./build.sh - ./build.sh - env: - # Work around https://github.com/actions/setup-dotnet/issues/29 - DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 - CI: true - - name: Build - if: runner.os == 'Windows' - run: ./build.cmd - env: - # Work around https://github.com/actions/setup-dotnet/issues/29 - DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64 - CI: true diff --git a/Content/Library/.github/workflows/build.yml b/Content/Library/.github/workflows/build.yml index a8bbeb3f..1711c7e6 100644 --- a/Content/Library/.github/workflows/build.yml +++ b/Content/Library/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build master -on: [push] +on: [push, pull_request] jobs: build: @@ -10,7 +10,7 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] dotnet: [3.1.100] runs-on: ${{ matrix.os }} - + steps: - uses: actions/checkout@v1 - name: Setup .NET Core