Skip to content

Commit 81405bc

Browse files
cmhulbertbogovicj
authored andcommitted
ci: combine build-pr/master to build
1 parent cf0c396 commit 81405bc

2 files changed

Lines changed: 8 additions & 29 deletions

File tree

.github/workflows/build-pr.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@ on:
44
push:
55
branches:
66
- master
7+
- development
78
tags:
89
- "*-[0-9]+.*"
10+
pull_request:
11+
branches:
12+
- master
13+
- development
914

1015
jobs:
1116
build:
12-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-latest
1318

1419
steps:
1520
- uses: actions/checkout@v2
@@ -25,8 +30,10 @@ jobs:
2530
cache: 'maven'
2631
- name: Set up CI environment
2732
run: .github/setup.sh
33+
shell: bash
2834
- name: Execute the build
2935
run: .github/build.sh
36+
shell: bash
3037
env:
3138
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
3239
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

0 commit comments

Comments
 (0)