From 9dc8dc16c4a9bef128c5d93aa4f223f821294d1f Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 21:56:56 +0200 Subject: [PATCH 1/7] Create build.yml --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..018dfde --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +# 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://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn verify -Ddocker_host=localhost From 9bb16f47d71c7b234e67e5849c42d129b551a4f1 Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 22:43:43 +0200 Subject: [PATCH 2/7] activate it profile with -Dit=true --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7c2b001..a65984c 100644 --- a/pom.xml +++ b/pom.xml @@ -91,13 +91,14 @@ it - docker_host + it + true 2375 + 0.0.0.0 5432 - @@ -114,7 +115,7 @@ tests-remote - ${docker_host} + ${postgres_host} ${postgres_port} @@ -141,7 +142,7 @@ - tcp://${docker_host}:${docker_port} + ${docker_host} postgres:11 From df2ecad728f6c8e5b5169f29a76188f640482532 Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 22:44:41 +0200 Subject: [PATCH 3/7] fix ci --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 018dfde..522bdc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,4 +23,4 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - run: mvn verify -Ddocker_host=localhost + run: mvn verify -Dit=true From 350ee1a9d44db3e2925a5c156c83d8498bc6a494 Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 22:47:23 +0200 Subject: [PATCH 4/7] fix java version on CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 522bdc6..e9bd7be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '16' distribution: 'temurin' cache: maven - name: Build with Maven From 9c269fc0b13077581546356ac5237d9fbabd828e Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 22:49:13 +0200 Subject: [PATCH 5/7] minor fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9bd7be..fe13275 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v2 with: java-version: '16' From c2d2ab5e249c2faadace70425781382ae66de843 Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 23:13:54 +0200 Subject: [PATCH 6/7] fix Readme --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bea24f2..93d1805 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ # spring-boot-tests ## Run Tests ``` -mvn verify -Ddocker_host=localhost +mvn verify -Dit=true + +# docker daemon host can be customized with: -Ddocker_host=unix:///var/run/docker.sock ``` ## Start/Stop containers for IDE tests running ``` -mvn docker:start -Ddocker_host=localhost -mvn docker:stop -Ddocker_host=localhost +mvn docker:start -Dit=true +mvn docker:stop -Dit=true + +# Docker Daemon host can be customized with: -Ddocker_host=unix:///var/run/docker.sock ``` From 4f4b416bcd15ef7bf86c3e9dab2c8c9ac7a24f57 Mon Sep 17 00:00:00 2001 From: Pavel Maslov Date: Tue, 8 Feb 2022 23:14:22 +0200 Subject: [PATCH 7/7] minor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93d1805..adcd315 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ``` mvn verify -Dit=true -# docker daemon host can be customized with: -Ddocker_host=unix:///var/run/docker.sock +# Docker Daemon host can be customized with: -Ddocker_host=unix:///var/run/docker.sock ``` ## Start/Stop containers for IDE tests running