Skip to content

Commit

Permalink
Merge pull request #140 from eliasnogueira/heroku
Browse files Browse the repository at this point in the history
Heroku
  • Loading branch information
eliasnogueira authored Mar 31, 2024
2 parents dae4168 + 89421c4 commit e05261f
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main Branch
name: On Merge

on:
push:
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: On Pull Request

on:
pull_request:
branches:
- main

jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
distribution: oracle
java-version: 22

- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build
run: mvn clean compile --file pom.xml

- name: Test
run: mvn test --file pom.xml
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.13.0] - 31-03-2024

### Added

- Added `system.properties` to deploy on Heroku
- New pipeline to run only during PR

## [1.12.0] - 31-03-2024

### Changed
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.eliasogueira.credit</groupId>
<artifactId>combined-credit-api</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.13.0-SNAPSHOT</version>

<distributionManagement>
<repository>
Expand Down
1 change: 1 addition & 0 deletions system.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=22

0 comments on commit e05261f

Please sign in to comment.