diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87942ce0..a269bc93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,15 +9,19 @@ jobs: java: ['17', '21'] services: db: - image: mysql:8.0 + image: postgres ports: - - 3306:3306 + - 5432:5432 env: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: bigtop_manager + POSTGRES_DB: bigtop_manager + POSTGRES_PASSWORD: postgres + prom: + image: prom/prometheus + ports: + - 9090:9090 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/bigtop-manager-server/src/main/resources/assembly/server.xml b/bigtop-manager-server/src/main/resources/assembly/server.xml index a7e3bd77..9004b16e 100644 --- a/bigtop-manager-server/src/main/resources/assembly/server.xml +++ b/bigtop-manager-server/src/main/resources/assembly/server.xml @@ -44,8 +44,8 @@ ${basedir}/src/main/resources/stacks stacks - 0644 - 0644 + 0755 + 0755 ${basedir}/../bigtop-manager-ui/dist diff --git a/pom.xml b/pom.xml index c7e82726..90939260 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,7 @@ **/*.ftl **/*.log pnpm-lock.yaml + **/target/**