Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build directly to static and added heroku deployment #5

Merged
merged 16 commits into from
Aug 30, 2023
Merged

Build directly to static and added heroku deployment #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9bbeff6
added heroku related configs
vegarrsm Aug 29, 2023
b83ea1b
added vite-config for building directly to static
vegarrsm Aug 29, 2023
e5e3953
fixed api url for build file
vegarrsm Aug 29, 2023
d5bd3cc
rebuilt
vegarrsm Aug 29, 2023
ec41f31
Merge remote-tracking branch 'origin' into heroku-deploy
vegarrsm Aug 30, 2023
f3b5624
Reverted to default build dir
vegarrsm Aug 30, 2023
853b358
moved Favicon to public folder
vegarrsm Aug 30, 2023
b28916b
added main.yml configs to push jar directly to github
vegarrsm Aug 30, 2023
5a6bbaa
removed prebuilt frontend
vegarrsm Aug 30, 2023
3bd6bbc
corrected master to main
vegarrsm Aug 30, 2023
39fdf3e
fixed api key secret
vegarrsm Aug 30, 2023
b134a18
testing other branch for heroku
vegarrsm Aug 30, 2023
ef8eccb
Trying akhileshns/heroku-deploy
vegarrsm Aug 30, 2023
4ca8032
added line to ensure it is only pushed to heroku when merging into main
vegarrsm Aug 30, 2023
ced3377
Removed unnecessary github action parameter
vegarrsm Aug 30, 2023
97d74cb
removed cross-env
vegarrsm Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,10 @@ jobs:
with:
name: production-files
path: db-scheduler-ui-backend/target/*.jar

- name: Deploy to Heroku
if: github.ref == 'refs/heads/main'
uses: akhileshns/[email protected]
with:
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: "jobjugglerapi"
1 change: 1 addition & 0 deletions db-scheduler-ui-backend/Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: java -jar target/db-scheduler-ui-backend-*.jar
32 changes: 24 additions & 8 deletions db-scheduler-ui-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,28 @@
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<verbose>true</verbose>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.heroku.sdk</groupId>
<artifactId>heroku-maven-plugin</artifactId>
<version>3.0.7</version>
</plugin>
</plugins>
</build>

</project>

</project>
3 changes: 1 addition & 2 deletions ...er-ui-backend/src/main/java/com/github/bekk/dbscheduleruibackend/service/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.github.bekk.dbscheduleruibackend.model.GetTasksResponse;
import com.github.bekk.dbscheduleruibackend.model.TaskData;
import com.github.bekk.dbscheduleruibackend.model.TaskType;
import com.github.bekk.dbscheduleruibackend.model.TaskRequestParams.TaskFilter;
import com.github.bekk.dbscheduleruibackend.util.mapper.TaskMapper;
import com.github.kagkarlsson.scheduler.ScheduledExecution;
import com.github.kagkarlsson.scheduler.Scheduler;
Expand Down Expand Up @@ -90,7 +89,7 @@ public void runAllTasks(){

public GetTasksResponse getAllTasks(TaskRequestParams params) {
List<TaskModel> tasks = TaskMapper.mapAllExecutionsToTaskModel(scheduler.getScheduledExecutions(), scheduler.getCurrentlyExecuting()).stream().filter(task -> {
if (params.getFilter() != TaskFilter.ALL) {
if (params.getFilter() != TaskRequestParams.TaskFilter.ALL) {
return switch (params.getFilter()) {
case FAILED -> task.getConsecutiveFailures() != 0;
case RUNNING -> task.isPicked();
Expand Down
2 changes: 1 addition & 1 deletion db-scheduler-ui-backend/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
server.port=8081
server.port=${PORT:8081}
spring.datasource.url=jdbc:h2:file:./db-scheduler-ui-backend/test-db;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE;DEFAULT_NULL_ORDERING=HIGH
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funker den H2 greia her på heroku?

spring.datasource.driver-class-name=org.h2.Driver
1 change: 1 addition & 0 deletions db-scheduler-ui-backend/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java.runtime.version=17
2 changes: 1 addition & 1 deletion db-scheduler-ui-frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang='en'>
<head>
<meta charset='UTF-8' />
<link rel="icon" type="image/svg+xml" href="./src/assets/src/icons/Favicon.svg" />
<link rel="icon" type="image/svg+xml" href="./public/Favicon.svg" />
<meta name='viewport' content='width=device-width, initial-scale=1.0' />
<title>JobJuggler</title>
</head>
Expand Down
19 changes: 19 additions & 0 deletions db-scheduler-ui-frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...-ui-frontend/src/assets/icons/Favicon.svg → db-scheduler-ui-frontend/public/Favicon.svg
View file
Open in desktop
File renamed without changes