Merge branch 'deploy-playground' into develop

hotungkhanh · Sep 22, 2024 · 0defde9 · 0defde9
2 parents bff4568 + bee7255
commit 0defde9
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,9 +1,9 @@
-name: CI/CD Pipeline
+name: Deploy
 
 on:
   push:
     branches:
-      - develop
+      - deploy-playground
 
 jobs:
   build:
@@ -54,4 +54,4 @@ jobs:
       #     heroku_api_key: ${{secrets.HEROKU_API_KEY}}
       #     heroku_app_name: ${{secrets.HEROKU_BACKEND_APP_NAME}}
       #     heroku_email: ${{secrets.HEROKU_EMAIL}}
-      #     appdir: "backend"
+      #     appdir: "backend"
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/jetedge.iml b/.idea/jetedge.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/backend/Procfile b/backend/Procfile
@@ -0,0 +1 @@
+java -Dquarkus.http.port=8080 -jar example-runner.java
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -6,6 +6,8 @@ quarkus.http.cors.origins=*
 quarkus.http.cors.methods=GET,POST,PUT,DELETE,OPTIONS
 quarkus.http.cors.headers=Content-Type,Authorization
 
+#quarkus.http.port=${PORT 8080}
+
 # datasource config
 quarkus.datasource.db-kind = postgresql
 quarkus.datasource.username = ${QUARKUS_DATASOURCE_USERNAME}

diff --git a/backend/src/test/java/org/acme/TimetableResourceTest.java b/backend/src/test/java/org/acme/TimetableResourceTest.java
@@ -8,13 +8,13 @@
 
 @QuarkusTest
 class TimetableResourceTest {
-    @Test
-    void testHelloEndpoint() {
-        given()
-          .when().get("/hello")
-          .then()
-             .statusCode(200)
-             .body(is("Hello from Quarkus REST"));
-    }
+//    @Test
+//    void testHelloEndpoint() {
+//        given()
+//          .when().get("/hello")
+//          .then()
+//             .statusCode(200)
+//             .body(is("Hello from Quarkus REST"));
+//    }
 
 }
diff --git a/backend/system.properties b/backend/system.properties
@@ -0,0 +1 @@
+java.runtime.version=17
diff --git a/package-lock.json b/package-lock.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		java -Dquarkus.http.port=8080 -jar example-runner.java