Skip to content

Commit 62272ce

Browse files
committed
CI changed
1 parent b11edf7 commit 62272ce

1 file changed

Lines changed: 8 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
build:
1616
name: Build & Test
1717
runs-on: ubuntu-latest
18-
environment: production
1918
container:
2019
image: openjdk:21-slim
2120

@@ -24,12 +23,12 @@ jobs:
2423
image: postgres:15
2524
env:
2625
POSTGRES_DB: database
27-
POSTGRES_USER: user
28-
POSTGRES_PASSWORD: pass
26+
POSTGRES_USER: postgres
27+
POSTGRES_PASSWORD: postgres
2928
ports:
3029
- 5432:5432
3130
options: >-
32-
--health-cmd "pg_isready -U user -d database"
31+
--health-cmd pg_isready
3332
--health-interval 10s
3433
--health-timeout 5s
3534
--health-retries 5
@@ -43,12 +42,6 @@ jobs:
4342
apt-get update
4443
apt-get install -y postgresql-client netcat-openbsd
4544
46-
- name: Debug Environment Variables
47-
run: |
48-
echo "Database URL=jdbc:postgresql://postgres:5432/database"
49-
echo "Database Username=${{ secrets.SPRING_DATASOURCE_USERNAME }}"
50-
echo "Database Password=${{ secrets.SPRING_DATASOURCE_PASSWORD }}"
51-
5245
- name: Wait for PostgreSQL to be Ready
5346
run: |
5447
echo "Waiting for PostgreSQL to be ready..."
@@ -62,25 +55,20 @@ jobs:
6255
- name: Set Executable Permission for Gradle Wrapper
6356
run: chmod +x gradlew
6457

65-
- name: Create Database User with Privileges
66-
run: |
67-
PGPASSWORD=postgres psql -h postgres -U postgres -d database -c "CREATE USER ${{ secrets.SPRING_DATASOURCE_USERNAME }} WITH PASSWORD '${{ secrets.SPRING_DATASOURCE_PASSWORD }}';"
68-
PGPASSWORD=postgres psql -h postgres -U postgres -d database -c "GRANT ALL PRIVILEGES ON DATABASE database TO ${{ secrets.SPRING_DATASOURCE_USERNAME }};"
69-
7058
- name: Check Database Connection
7159
run: |
72-
PGPASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }} psql -h postgres -U ${{ secrets.SPRING_DATASOURCE_USERNAME }} -d database -c "SELECT 'Connected to PostgreSQL!'"
60+
PGPASSWORD=postgres psql -h postgres -U postgres -d database -c "SELECT 'Connected to PostgreSQL!'"
7361
7462
- name: Build with Gradle
7563
run: ./gradlew clean build
7664
env:
7765
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/database
78-
SPRING_DATASOURCE_USERNAME: ${{ secrets.SPRING_DATASOURCE_USERNAME }}
79-
SPRING_DATASOURCE_PASSWORD: ${{ secrets.SPRING_DATASOURCE_PASSWORD }}
66+
SPRING_DATASOURCE_USERNAME: postgres
67+
SPRING_DATASOURCE_PASSWORD: postgres
8068

8169
- name: Run Tests
8270
run: ./gradlew test
8371
env:
8472
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/database
85-
SPRING_DATASOURCE_USERNAME: ${{ secrets.SPRING_DATASOURCE_USERNAME }}
86-
SPRING_DATASOURCE_PASSWORD: ${{ secrets.SPRING_DATASOURCE_PASSWORD }}
73+
SPRING_DATASOURCE_USERNAME: postgres
74+
SPRING_DATASOURCE_PASSWORD: postgres

0 commit comments

Comments
 (0)