From da8af78c93544b9b238905002223f81a0c0bcc30 Mon Sep 17 00:00:00 2001 From: nigosto Date: Fri, 2 May 2025 22:36:30 +0300 Subject: [PATCH 1/5] Fix identation --- .github/workflows/build.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d2e9df0..ee89f68 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,19 +7,19 @@ jobs: runs-on: ubuntu-latest services: - postgres: - image: postgres:15 - ports: - - 5433:5432 - env: - POSTGRES_USER: ${{ secrets.TEST_POSTGRES_USER }} - POSTGRES_DB: ${{ secrets.TEST_POSTGRES_DB }} - POSTGRES_PASSWORD: ${{ secrets.TEST_POSTGRES_PASSWORD }} - options: >- - --health-cmd="pg_isready -U ${{ secrets.TEST_POSTGRES_USER }}" - --health-interval=10s - --health-timeout=5s - --health-retries=5 + postgres: + image: postgres:15 + ports: + - 5433:5432 + env: + POSTGRES_USER: ${{ secrets.TEST_POSTGRES_USER }} + POSTGRES_DB: ${{ secrets.TEST_POSTGRES_DB }} + POSTGRES_PASSWORD: ${{ secrets.TEST_POSTGRES_PASSWORD }} + options: >- + --health-cmd="pg_isready -U ${{ secrets.TEST_POSTGRES_USER }}" + --health-interval=10s + --health-timeout=5s + --health-retries=5 steps: - uses: actions/checkout@v3 From 766465aa2ffb6673ef7e8da3a2368e2097aee7bf Mon Sep 17 00:00:00 2001 From: nigosto Date: Fri, 2 May 2025 22:39:16 +0300 Subject: [PATCH 2/5] Use env variable intead of secret --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ee89f68..3ed0d4c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: POSTGRES_DB: ${{ secrets.TEST_POSTGRES_DB }} POSTGRES_PASSWORD: ${{ secrets.TEST_POSTGRES_PASSWORD }} options: >- - --health-cmd="pg_isready -U ${{ secrets.TEST_POSTGRES_USER }}" + --health-cmd="pg_isready -U $POSTGRES_USER" --health-interval=10s --health-timeout=5s --health-retries=5 From c07b63973bddfecf811a71ff16b77f6612bfdcbb Mon Sep 17 00:00:00 2001 From: nigosto Date: Fri, 2 May 2025 22:44:52 +0300 Subject: [PATCH 3/5] Update action versions --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3ed0d4c..aa2d885 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,9 +22,9 @@ jobs: --health-retries=5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' From 7b789b4de47da0401dc68e011a55fa4378b451ad Mon Sep 17 00:00:00 2001 From: nigosto Date: Fri, 2 May 2025 22:46:35 +0300 Subject: [PATCH 4/5] Install sbt --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aa2d885..254916a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -29,5 +29,6 @@ jobs: java-version: '11' distribution: 'temurin' cache: 'sbt' + - uses: sbt/setup-sbt@v1 - name: Run tests run: sbt test \ No newline at end of file From 55b239c1bd5416aa5d2ba8929f98a2a7d64c4618 Mon Sep 17 00:00:00 2001 From: nigosto Date: Fri, 2 May 2025 23:01:26 +0300 Subject: [PATCH 5/5] Add application.conf in build --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 254916a..683ca89 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,5 +30,8 @@ jobs: distribution: 'temurin' cache: 'sbt' - uses: sbt/setup-sbt@v1 + - name: Create application.conf + run: | + echo "${{ secrets.PRODUCTION_CONFIG }}" > src/main/resources/application.conf - name: Run tests run: sbt test \ No newline at end of file