diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci-cd.yml (renamed from .github/workflows/ci.yml) | 8 | ||||
| -rw-r--r-- | .github/workflows/pr-build.yml | 32 |
2 files changed, 35 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-cd.yml index 88f9f05f..24f170c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-cd.yml @@ -1,10 +1,8 @@ -name: CI Build +name: ci-cd on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ main ] env: DOCKERHUB_USER: hildan @@ -14,7 +12,7 @@ env: HEROKU_APP_NAME: seven-wonders-online jobs: - build: + build-and-deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml new file mode 100644 index 00000000..67a9c9be --- /dev/null +++ b/.github/workflows/pr-build.yml @@ -0,0 +1,32 @@ +name: pr-build + +on: + pull_request: + branches: [ main ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 15 + uses: actions/setup-java@v1.4.3 + with: + java-version: 15 + + - name: Gradle build cache + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-build-${{ hashFiles('**/*.gradle*') }} + restore-keys: ${{ runner.os }}-gradle-build- + + - name: Gradle wrapper cache + uses: actions/cache@v2 + with: + path: ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle-wrapper.properties') }} + + - name: Build with Gradle + run: ./gradlew build |