CI/CD update

Author: iakkov

.github/workflows/ci.yml

@@ -1,35 +1,43 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Java CI with Maven
+name: CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - main
   pull_request:
-    branches: [ "master" ]
 
-jobs:
-  build:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
+  build-and-test:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: maven
+
+      - name: Make Maven wrapper executable
+        run: chmod +x mvnw
+
+      - name: Validate Docker availability
+        run: docker info
+
+      - name: Build application image
+        run: docker build -t avito-test-app .
+
+      - name: Run unit and integration tests
+        env:
+          MAVEN_OPTS: "-Dmaven.repo.local=${{ github.workspace }}/.m2/repository"
+        run: ./mvnw -B -ntp verify

Dockerfile

@@ -2,19 +2,21 @@ FROM maven:3.9-eclipse-temurin-17 AS build
 WORKDIR /app
 
 COPY pom.xml .
-COPY avito-test-domain/pom.xml ./avito-test-domain/
-COPY avito-test-db/pom.xml ./avito-test-db/
-COPY avito-test-impl/pom.xml ./avito-test-impl/
+COPY avito-test-domain/pom.xml avito-test-domain/
+COPY avito-test-db/pom.xml avito-test-db/
+COPY avito-test-impl/pom.xml avito-test-impl/
 
-COPY avito-test-domain/src ./avito-test-domain/src
-COPY avito-test-db/src ./avito-test-db/src
-COPY avito-test-impl/src ./avito-test-impl/src
+RUN mvn -B dependency:go-offline
+
+COPY avito-test-domain/src avito-test-domain/src
+COPY avito-test-db/src avito-test-db/src
+COPY avito-test-impl/src avito-test-impl/src
 
-WORKDIR /app
 RUN mvn clean install -DskipTests
 
 FROM eclipse-temurin:17-jre
 WORKDIR /app
 COPY --from=build /app/avito-test-impl/target/*.jar app.jar
 EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "app.jar"]
+