Skip to content

Commit

Permalink
Merge pull request #1 from Handy-Software/release
Browse files Browse the repository at this point in the history
Merge release into development
  • Loading branch information
martvdm authored Jun 22, 2024
2 parents 6da4eb2 + 7fe81fe commit 819ca98
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 32 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
41 changes: 34 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ name: CI Pipeline
on:
push:
branches:
- main
- release
- development
pull_request:
branches:
- main
- release
- development
- '*'

jobs:
build:
build-and-test:
runs-on: ubuntu-latest

steps:
Expand All @@ -19,6 +22,7 @@ jobs:
- name: Set up JDK 22
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '22'

- name: Cache Maven packages
Expand All @@ -29,11 +33,34 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Run Checkstyle
run: mvn checkstyle:check

- name: Build with Maven
run: mvn clean install
run: mvn clean install -ntp

- name: Run tests
run: mvn test

deploy:
needs: build-and-test
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/release'

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up JDK 22
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '22'

- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Deploy to Production
run: echo "Deploying to production..."
10 changes: 10 additions & 0 deletions .run/RoomradarApplication.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RoomradarApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
<option name="ACTIVE_PROFILES" value="local" />
<module name="roomradar" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.handy.software.roomradar.RoomradarApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
1 change: 0 additions & 1 deletion compose.yaml

This file was deleted.

30 changes: 6 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-graphql</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
Expand All @@ -54,13 +50,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-docker-compose</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -86,23 +75,16 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/application-local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spring.graphql.graphiql.enabled=true
spring.devtools.restart.poll-interval=2s
spring.devtools.restart.quiet-period=1s
1 change: 1 addition & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
spring.application.name=roomradar
server.error.whitelabel.enabled=false
3 changes: 3 additions & 0 deletions src/main/resources/graphql/schema.graphqls
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
type Query {
test: [String]
}

0 comments on commit 819ca98

Please sign in to comment.