From 78b7bf8655a3d9ad9344f0a4ae04b11bc479beb8 Mon Sep 17 00:00:00 2001 From: lukaDjordjevic01 <96748944+lukaDjordjevic01@users.noreply.github.com> Date: Thu, 22 Jan 2026 21:22:22 +0100 Subject: [PATCH 1/3] Add failing test. --- .../com/devoops/backend_poc/BackendPocApplicationTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java b/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java index bae1e6a..975b87b 100644 --- a/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java +++ b/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java @@ -10,4 +10,9 @@ class BackendPocApplicationTests { void contextLoads() { } + @Test + void failingTest() { + throw new RuntimeException("This test is failing"); + } + } From c018bbb571cfde59ffbc256dc46bc1cdebb81122 Mon Sep 17 00:00:00 2001 From: lukaDjordjevic01 <96748944+lukaDjordjevic01@users.noreply.github.com> Date: Thu, 22 Jan 2026 21:32:22 +0100 Subject: [PATCH 2/3] Fix failing test. --- .../com/devoops/backend_poc/BackendPocApplicationTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java b/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java index 975b87b..9e31ffd 100644 --- a/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java +++ b/src/test/java/com/devoops/backend_poc/BackendPocApplicationTests.java @@ -11,8 +11,8 @@ void contextLoads() { } @Test - void failingTest() { - throw new RuntimeException("This test is failing"); + void notFailingTest() { + System.out.println( "Not failing test"); } } From 47d332c6ba3cefeac7fc96bb12704c866ed24b95 Mon Sep 17 00:00:00 2001 From: lukaDjordjevic01 <96748944+lukaDjordjevic01@users.noreply.github.com> Date: Mon, 26 Jan 2026 20:42:01 +0100 Subject: [PATCH 3/3] Add semantic versioning. --- .github/workflows/ci.yml | 40 ++++++++++++++++++++++++++++++---- .github/workflows/pr-check.yml | 7 ++---- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b38648..147f19b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: push: branches: - develop + - main + tags: + - 'v*' + env: DOCKERHUB_USERNAME: threeamigoscoding @@ -28,8 +32,29 @@ jobs: - name: Build with Gradle run: ./gradlew clean build - - name: Display build success - run: echo "Build completed successfully!" + - name: Run tests + run: ./gradlew test + + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: build-artifact + path: build/libs/*.jar + retention-days: 1 + + publish: + needs: build + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Download build artifact + uses: actions/download-artifact@v4 + with: + name: build-artifact + path: build/libs - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -43,8 +68,15 @@ jobs: - name: Generate version tag id: version run: | - SHORT_SHA=$(git rev-parse --short HEAD) - VERSION_TAG="develop-${SHORT_SHA}" + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION_TAG=${GITHUB_REF#refs/tags/v} + elif [[ $GITHUB_REF == refs/heads/main ]]; then + SHORT_SHA=$(git rev-parse --short HEAD) + VERSION_TAG="main-${SHORT_SHA}" + else + SHORT_SHA=$(git rev-parse --short HEAD) + VERSION_TAG="develop-${SHORT_SHA}" + fi echo "tag=$VERSION_TAG" >> $GITHUB_OUTPUT echo "Generated version tag: $VERSION_TAG" diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 890a5d8..e6f3777 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - master + - main jobs: build-and-test: @@ -24,7 +24,4 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle - run: ./gradlew clean build - - - name: Run unit tests - run: ./gradlew test + run: ./gradlew clean build \ No newline at end of file