Merge pull request #28 from simonyiszk/feature/automate-builds

Automate builds
simonyiszk · Aug 23, 2024 · 923305b · 923305b
2 parents 428545a + 446015c
commit 923305b
Show file tree

Hide file tree

Showing 69 changed files with 76 additions and 3,038 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -10,14 +10,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-        cache: gradle
-    
-    - name: Build with Gradle - Backend
-      working-directory: backend
-      run: sh ./gradlew clean build
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Build with Gradle - Backend
+        working-directory: backend
+        run: sh ./gradlew clean build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,50 @@
+name: Create and publish native image
+
+on:
+  push:
+    branches: [ 'master' ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Build with Gradle - Backend
+        working-directory: backend
+        run: sh ./gradlew clean bootBuildImage --imageName=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Push image
+        run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Run the following commands in the root directory of the project:
 
 ```bash
 cd backend
-./gradlew clean bootBuildImage --imageName=kir-dev/paybasz && docker-compose up -d
+docker-compose up -d
 ```
 
 If you deploy on lois with certbot and NGINX, it's better to disable `server.ssl.enabled` in the backend `application.properties` files.
@@ -188,5 +188,3 @@ There was a live testing this summer. It took place at the TTNY summer camp.
 - More gateway debug possibilities needed
 - Named items (eg.: #117 -> "Napi menü" 650 JMF / 5dl)
 - Export to unique email per user 
-
-
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -55,3 +55,10 @@ kotlin {
     freeCompilerArgs.addAll("-Xjsr305=strict")
   }
 }
+
+tasks.getByName<org.springframework.boot.gradle.tasks.bundling.BootBuildImage>("bootBuildImage") {
+  environment.put(
+    "BP_NATIVE_IMAGE_BUILD_ARGUMENTS",
+    "${environment.get()["BP_NATIVE_IMAGE_BUILD_ARGUMENTS"] ?: ""} -march=compatibility"
+  )
+}
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/app/AnalyticsAdminController.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/app/AnalyticsAdminController.kt
@@ -35,4 +35,4 @@ class AnalyticsAdminController(
     transactionVolume = transactionService.getTransactionVolume()
   )
 
-}
+}
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/app/BackendConfig.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/app/BackendConfig.kt
@@ -5,4 +5,4 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 
 @EnableConfigurationProperties
 @ConfigurationProperties(prefix = "hu.bme.sch.paybasz.backend")
-data class BackendConfig(val frontendUrl: String)
+data class BackendConfig(val frontendUrl: String)
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/event/OrderEventListener.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/event/OrderEventListener.kt
@@ -116,4 +116,4 @@ class OrderEventListener(private val eventService: EventService) {
   private fun displayVoucher(voucher: Voucher) =
     "Számlaazonosító: ${voucher.accountId}, Termékazonosító: ${voucher.itemId}, Darabszám: ${voucher.count}"
 
-}
+}
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/event/PrincipalEventListener.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/event/PrincipalEventListener.kt
@@ -49,4 +49,4 @@ class PrincipalEventListener(private val eventService: EventService) {
       }
     }"
 
-}
+}
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/principal/PrincipalLastUseUpdater.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/principal/PrincipalLastUseUpdater.kt
@@ -13,4 +13,4 @@ class PrincipalLastUseUpdater(private val principalService: PrincipalService) {
     principalService.updateLastUsed(event.principal.id)
   }
 
-}
+}
diff --git a/backend/src/main/kotlin/hu/bme/sch/paybasz/transaction/Transaction.kt b/backend/src/main/kotlin/hu/bme/sch/paybasz/transaction/Transaction.kt
@@ -7,7 +7,7 @@ import org.springframework.modulith.ApplicationModule
 
 
 @ApplicationModule
-@Table("transactions",)
+@Table("transactions")
 data class Transaction(
   @Id @Column() var id: Int?,
   val type: TransactionType,

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     networks:
       - network-x
   backend-x:
-    image: kir-dev/paybasz:latest
+    image: ghcr.io/simonyiszk/paybasz-next:latest
     env_file:
       - .env
     environment:

diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/backend_add_user.png b/docs/backend_add_user.png
diff --git a/docs/backend_analitics.png b/docs/backend_analitics.png
diff --git a/docs/backend_export.png b/docs/backend_export.png
diff --git a/docs/backend_gateways.png b/docs/backend_gateways.png
diff --git a/docs/backend_payment.png b/docs/backend_payment.png
diff --git a/docs/backend_transactions.png b/docs/backend_transactions.png
diff --git a/docs/backend_upload.png b/docs/backend_upload.png
diff --git a/docs/backend_users.png b/docs/backend_users.png
diff --git a/docs/buzzer_preview.png b/docs/buzzer_preview.png
diff --git a/docs/esp32_preview.png b/docs/esp32_preview.png
diff --git a/docs/keypad_preview.png b/docs/keypad_preview.png
diff --git a/docs/oled_preview.png b/docs/oled_preview.png
diff --git a/docs/proto1_preview1.jpg b/docs/proto1_preview1.jpg
diff --git a/docs/proto1_preview2.jpg b/docs/proto1_preview2.jpg
diff --git a/docs/proto1_preview3.jpg b/docs/proto1_preview3.jpg
diff --git a/docs/proto2_preview1.jpg b/docs/proto2_preview1.jpg
diff --git a/docs/proto2_preview2.jpg b/docs/proto2_preview2.jpg
diff --git a/docs/proto2_preview3.jpg b/docs/proto2_preview3.jpg
diff --git a/docs/rc522_preview.png b/docs/rc522_preview.png
diff --git a/firmware/.gitignore b/firmware/.gitignore
diff --git a/firmware/Makefile b/firmware/Makefile
diff --git a/firmware/docs/commands.md b/firmware/docs/commands.md
diff --git a/firmware/docs/esp32_pinout.jpg b/firmware/docs/esp32_pinout.jpg
diff --git a/firmware/docs/membran_switch.jpg b/firmware/docs/membran_switch.jpg
diff --git a/firmware/docs/rc522_pinout.png b/firmware/docs/rc522_pinout.png
diff --git a/firmware/docs/ssd1331-oled-display_pinout.jpg b/firmware/docs/ssd1331-oled-display_pinout.jpg
diff --git a/firmware/graphics/banner.bitmap b/firmware/graphics/banner.bitmap
diff --git a/firmware/graphics/banner.bmp b/firmware/graphics/banner.bmp
diff --git a/firmware/graphics/banner.png b/firmware/graphics/banner.png
diff --git a/firmware/graphics/banner_green.png b/firmware/graphics/banner_green.png
diff --git a/firmware/graphics/banner_white.png b/firmware/graphics/banner_white.png
diff --git a/firmware/src/ArduinoSpi3.cpp b/firmware/src/ArduinoSpi3.cpp
diff --git a/firmware/src/ArduinoSpi3.h b/firmware/src/ArduinoSpi3.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ class AnalyticsAdminController( @@
         transactionVolume = transactionService.getTransactionVolume()
       )
-    }
+    }