Skip to content

Commit 2d40de5

Browse files
committed
finalize
1 parent 5b1c374 commit 2d40de5

4 files changed

Lines changed: 24 additions & 59 deletions

File tree

.github/workflows/on_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
uses: ./.github/workflows/test.yml
1717
secrets:
1818
USERNAME_MAVEN: ${{ secrets.USERNAME_MAVEN }}
19-
TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}
19+
TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}

.github/workflows/on_push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
uses: ./.github/workflows/publish.yml
1414
secrets:
1515
USERNAME_MAVEN: ${{ secrets.USERNAME_MAVEN }}
16-
TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}
16+
TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
java-version: '21'
2424
distribution: 'temurin'
2525

26-
- name: Build & Publish
26+
- name: Publish
2727
uses: gradle/gradle-build-action@v2
2828
with:
2929
arguments: publish

.github/workflows/test.yml

Lines changed: 21 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ name: Test
22

33
on:
44
workflow_call:
5-
secrets:
6-
USERNAME_MAVEN:
7-
required: true
8-
TOKEN_MAVEN:
9-
required: true
105
workflow_dispatch:
116
push:
127
branches:
@@ -33,26 +28,6 @@ jobs:
3328
steps:
3429
- name: Checkout code
3530
uses: actions/checkout@v4
36-
with:
37-
fetch-depth: 0 # fetch-depth 0 needed for version calculation
38-
39-
# TODO: remove the steps below before committing PR
40-
- name: Check Maven secrets
41-
env:
42-
USERNAME_MAVEN: ${{ secrets.USERNAME_MAVEN }}
43-
TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}
44-
run: |
45-
if [ -z "$USERNAME_MAVEN" ]; then
46-
echo "USERNAME_MAVEN secret is NOT set"
47-
else
48-
echo "USERNAME_MAVEN is set to '$USERNAME_MAVEN'"
49-
fi
50-
51-
if [ -z "$TOKEN_MAVEN" ]; then
52-
echo "TOKEN_MAVEN secret is NOT set"
53-
else
54-
echo "TOKEN_MAVEN is set"
55-
fi
5631

5732
- name: Set up OpenJDK 21
5833
uses: actions/setup-java@v4
@@ -65,38 +40,28 @@ jobs:
6540
with:
6641
gradle-version: wrapper
6742

68-
# TODO: re-enable
69-
# - name: Wait for PostgreSQL
70-
# run: |
71-
# until pg_isready -h localhost -p 5432 -U postgres; do
72-
# echo "Waiting for PostgreSQL..."
73-
# sleep 2
74-
# done
75-
# env:
76-
# PGPASSWORD: dbos
77-
78-
# - name: Run tests
79-
# uses: gradle/gradle-build-action@v2
80-
# with:
81-
# arguments: clean test
82-
# cache-dependencies: true
83-
# env:
84-
# PGPASSWORD: dbos
85-
86-
# - name: Upload test results
87-
# uses: actions/upload-artifact@v4
88-
# if: always()
89-
# with:
90-
# name: test-results
91-
# path: |
92-
# build/reports/tests/
93-
# build/test-results/
43+
- name: Wait for PostgreSQL
44+
run: |
45+
until pg_isready -h localhost -p 5432 -U postgres; do
46+
echo "Waiting for PostgreSQL..."
47+
sleep 2
48+
done
49+
env:
50+
PGPASSWORD: dbos
9451

95-
# TODO: remove the steps below before committing PR
96-
- name: Publish
52+
- name: Run tests
9753
uses: gradle/gradle-build-action@v2
9854
with:
99-
arguments: publish
55+
arguments: clean test
56+
cache-dependencies: true
10057
env:
101-
USERNAME: ${{ secrets.USERNAME_MAVEN }}
102-
TOKEN: ${{ secrets.TOKEN_MAVEN }}
58+
PGPASSWORD: dbos
59+
60+
- name: Upload test results
61+
uses: actions/upload-artifact@v4
62+
if: always()
63+
with:
64+
name: test-results
65+
path: |
66+
build/reports/tests/
67+
build/test-results/

0 commit comments

Comments
 (0)