diff --git a/.github/workflows/junit.yml b/.github/workflows/junit.yml index 44c80b951..f3fd59429 100644 --- a/.github/workflows/junit.yml +++ b/.github/workflows/junit.yml @@ -21,7 +21,7 @@ on: - greenwich jobs: - set-matrix: + set-jdks: runs-on: ubuntu-latest outputs: jdks: ${{ steps.set-jdks.outputs.jdks }} @@ -52,21 +52,14 @@ jobs: else echo "jdks=[17]" >> $GITHUB_OUTPUT fi - cat $GITHUB_OUTPUT shopt -u nocasematch - check-matrix: - runs-on: ubuntu-latest - steps: - - name: Check JDK matrix based on branch - id: check-matrix - run: | - echo "${{ needs.set-matrix.outputs.jdks }}" junit: strategy: matrix: - java: ${{ fromJson(needs.set-matrix.outputs.jdks) }} + java: ${{ fromJson(needs.set-jdks.outputs.jdks) }} os: [ 'windows-latest', 'ubuntu-latest' ] runs-on: ${{ matrix.os }} + needs: set-jdks steps: - name: Checkout codes uses: actions/checkout@v4 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index e8f5c9ae1..70b426b15 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -15,12 +15,12 @@ jobs: check-snapshot: runs-on: ubuntu-latest outputs: - IS_SNAPSHOT: ${{ steps.check_deploy_type.outputs.IS_SNAPSHOT }} + IS_SNAPSHOT: ${{ steps.check-deploy-type.outputs.IS_SNAPSHOT }} steps: - name: Checkout codes uses: actions/checkout@v4 - name: Check deploy type - id: check_deploy_type + id: check-deploy-type run: | line="$(grep SNAPSHOT pom.xml || true)" echo $line @@ -58,7 +58,7 @@ jobs: shopt -u nocasematch snapshot: runs-on: ubuntu-latest - needs: check-snapshot + needs: [ check-snapshot, set-jdk ] if: ${{ needs.check-snapshot.outputs.IS_SNAPSHOT == 'true' }} steps: - name: Checkout codes