Unverified Commit f3f3ada9 authored by samz406's avatar samz406 Committed by GitHub
Browse files

Merge pull request #14 from apache/dev 

update
parents 67367658 78268436

.github/workflows/ci_ut.yml

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#



on: ["pull_request"]

env:

  DOCKER_DIR: ./docker

  LOG_DIR: /tmp/dolphinscheduler



name: Test Coveralls Parallel
@@ -35,6 +38,8 @@ jobs: 
          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

          restore-keys: |

            ${{ runner.os }}-maven-

      - name: Bootstrap database

        run: cd ${DOCKER_DIR} && docker-compose up -d

      - name: Set up JDK 1.8

        uses: actions/setup-java@v1

        with:
@@ -44,3 +49,9 @@ jobs: 
          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'

          mvn test -Dmaven.test.skip=false cobertura:cobertura

          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)

      - name: Collect logs

        run: |

          mkdir -p ${LOG_DIR}

          cd ${DOCKER_DIR}

          docker-compose logs db > ${LOG_DIR}/db.txt

        continue-on-error: true

docker/README.md

0 → 100644
+0 −0

Empty file added.

docker/docker-compose.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
version: '2'

services:

  zookeeper:

    image: zookeeper

    restart: always

    container_name: zookeeper

    ports:

      - "2181:2181"

    environment:

      ZOO_MY_ID: 1

  db:

    image: postgres

    container_name: postgres

    environment:

      - POSTGRES_USER=test

      - POSTGRES_PASSWORD=test

      - POSTGRES_DB=dolphinscheduler

    ports:

      - "5432:5432"

    volumes:

      - pgdata:/var/lib/postgresql/data

      - ./postgres/docker-entrypoint-initdb:/docker-entrypoint-initdb.d

volumes:

  pgdata:

docker/postgres/docker-entrypoint-initdb/init.sql

0 → 100755
+771 −0

File added.

Preview size limit exceeded, changes collapsed.

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell; 
import org.apache.poi.hssf.usermodel.HSSFRow;

import org.apache.poi.hssf.usermodel.HSSFSheet;

import org.apache.poi.hssf.usermodel.HSSFWorkbook;

import org.apache.poi.ss.usermodel.CellStyle;

import org.apache.poi.ss.usermodel.HorizontalAlignment;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -71,10 +73,14 @@ public class ExcelUtils { 
               //set the height of the first line

               row.setHeight((short)500);



               //set Horizontal right

               CellStyle cellStyle = wb.createCellStyle();

               cellStyle.setAlignment(HorizontalAlignment.RIGHT);



               //setting excel headers

               for (int i = 0; i < headerList.size(); i++) {

                   HSSFCell cell = row.createCell(i);

                   cell.setCellStyle(cellStyle);

                   cell.setCellValue(headerList.get(i));

               }
@@ -88,6 +94,7 @@ public class ExcelUtils { 
                   rowIndex++;

                   for (int j = 0 ; j < values.length ; j++){

                       HSSFCell cell1 = row.createCell(j);

                       cell1.setCellStyle(cellStyle);

                       cell1.setCellValue(String.valueOf(values[j]));

                   }

               }