From c95cdeb10bbcc70cbea090c732ce5fe6df57b92d Mon Sep 17 00:00:00 2001 From: emeroad Date: Fri, 31 Dec 2021 12:38:56 +0900 Subject: [PATCH] [#noissue] Cleanup workflow --- .github/workflows/it-command.yml | 34 ++++++++++------------ .github/workflows/it-schedule.yml | 32 +++++++++----------- .github/workflows/maven-central-deploy.yml | 2 +- .github/workflows/maven.yml | 29 +++++++++--------- 4 files changed, 44 insertions(+), 53 deletions(-) diff --git a/.github/workflows/it-command.yml b/.github/workflows/it-command.yml index 318216325636..cfbc582b72e4 100644 --- a/.github/workflows/it-command.yml +++ b/.github/workflows/it-command.yml @@ -19,28 +19,10 @@ jobs: comment-id: ${{ github.event.client_payload.github.payload.comment.id }} body: | > Action has been started. [Click here to see the action](${{ steps.vars.outputs.run-url }}) - - name: Checkout + - name: Git checkout uses: actions/checkout@v2 with: ref: 'refs/pull/${{ env.PR_NUMBER }}/merge' - - name: Set up JDK 7 - uses: actions/setup-java@v1 - with: - java-version: 7 - - name: Set up JDK 9 - uses: actions/setup-java@v1 - with: - java-version: 9 - - name: Set JAVA_HOME - run: | - echo "JAVA_7_HOME=$JAVA_HOME_7_0_322_X64" >> $GITHUB_ENV - echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - echo "JAVA_9_HOME=$JAVA_HOME_9_0_7_X64" >> $GITHUB_ENV - echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV - echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - df -h - - name: Java Environment - run: env | grep '^JAVA' - name: Cache node modules uses: actions/cache@v2 with: @@ -66,6 +48,20 @@ jobs: sudo rm -rf /usr/local/lib/android sudo rm -rf /usr/share/dotnet df -h + - name: Set up JDK 7 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 7 + - name: Set JAVA_HOME + run: | + echo "JAVA_7_HOME=$JAVA_HOME_7_0_322_X64" >> $GITHUB_ENV + echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV + echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV + echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV + df -h + - name: Java Environment + run: env | grep '^JAVA' - name: Maven build run: | ./mvnw --batch-mode -Pit-module -DskipTests clean install diff --git a/.github/workflows/it-schedule.yml b/.github/workflows/it-schedule.yml index 0b299473092c..bef4739dd6fc 100644 --- a/.github/workflows/it-schedule.yml +++ b/.github/workflows/it-schedule.yml @@ -6,26 +6,8 @@ jobs: integration-test: runs-on: ubuntu-20.04 steps: - - name: Checkout + - name: Git checkout uses: actions/checkout@v2 - - name: Set up JDK 7 - uses: actions/setup-java@v1 - with: - java-version: 7 - - name: Set up JDK 9 - uses: actions/setup-java@v1 - with: - java-version: 9 - - name: Set JAVA_HOME - run: | - echo "JAVA_7_HOME=$JAVA_HOME_7_0_322_X64" >> $GITHUB_ENV - echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - echo "JAVA_9_HOME=$JAVA_HOME_9_0_7_X64" >> $GITHUB_ENV - echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV - echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - df -h - - name: Java Environment - run: env | grep '^JAVA' - name: Cache node modules uses: actions/cache@v2 with: @@ -51,6 +33,18 @@ jobs: sudo rm -rf /usr/local/lib/android sudo rm -rf /usr/share/dotnet df -h + - name: Set up JDK 7 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: 7 + - name: Set JAVA_HOME + run: | + echo "JAVA_7_HOME=$JAVA_HOME_7_0_322_X64" >> $GITHUB_ENV + echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV + echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV + - name: Java Environment + run: env | grep '^JAVA' - name: Maven build run: | ./mvnw --batch-mode -Pit-module -DskipTests clean install diff --git a/.github/workflows/maven-central-deploy.yml b/.github/workflows/maven-central-deploy.yml index 1458c81f0665..f2cbb2cda791 100644 --- a/.github/workflows/maven-central-deploy.yml +++ b/.github/workflows/maven-central-deploy.yml @@ -17,7 +17,7 @@ jobs: steps: - run: | echo "Release ref: ${{ github.event.inputs.git-ref }}" - - name : Git checkout + - name: Git checkout uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.git-ref }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 86972282a92e..628236c06422 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,20 +14,8 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - name: Set up JDK 7 - uses: actions/setup-java@v2 - with: - distribution: 'zulu' - java-version: '7' - - name: Set JAVA_HOME - run: | - echo "JAVA_7_HOME=$JAVA_HOME" >> $GITHUB_ENV - echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV - echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV - - name: Java Environment - run: env | grep '^JAVA' + - name: Git checkout + uses: actions/checkout@v2 - name: Cache Maven packages uses: actions/cache@v2 with: @@ -48,6 +36,19 @@ jobs: key: ${{ runner.os }}-node_install-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-node_install- + - name: Set up JDK 7 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '7' + - name: Set JAVA_HOME + run: | + echo "JAVA_7_HOME=$JAVA_HOME" >> $GITHUB_ENV + echo "JAVA_8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV + echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV + echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV + - name: Java Environment + run: env | grep '^JAVA' - name: Build with Maven run: ./mvnw --batch-mode -Pcode.coverage package --file pom.xml - name: Code coverage report