aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml11
-rw-r--r--src/test/resources/application-postgres.yml2
2 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7cd808d..b722d36d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,10 +5,13 @@ on:
push:
branches: [master]
+concurrency:
+ group: ${{ github.head_ref || github.ref }}
+ cancel-in-progress: true
+
jobs:
current:
- runs-on: ubuntu-latest
- timeout-minutes: 5
+ runs-on: self-hosted
strategy:
matrix:
profile: [default, postgres, mysql, sqlserver]
@@ -16,7 +19,7 @@ jobs:
postgres:
image: postgres
ports:
- - 5432:5432
+ - 5433:5432
env:
POSTGRES_DB: juick
POSTGRES_USER: juick
@@ -64,7 +67,7 @@ jobs:
defaults:
run:
working-directory: vnext
- runs-on: ubuntu-latest
+ runs-on: self-hosted
steps:
- uses: actions/checkout@v2
- name: Setup Node.JS 18
diff --git a/src/test/resources/application-postgres.yml b/src/test/resources/application-postgres.yml
index ed7249b3..9646bca9 100644
--- a/src/test/resources/application-postgres.yml
+++ b/src/test/resources/application-postgres.yml
@@ -1,6 +1,6 @@
spring:
datasource:
- url: jdbc:postgresql://localhost:5432/juick
+ url: jdbc:postgresql://localhost:5433/juick
username: juick
password: secret
flyway: