diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1ea972e389..07cbe49239 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,29 +22,33 @@ jobs: run: git checkout --progress --force ${{ github.sha }} - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/actions/wrapper-validation@v3 - name: Setup JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'zulu' java-version: '17' java-package: jdk+fx - name: Build and check with Gradle run: ./gradlew check - - name: Perform IO redirection test (*NIX) + - name: Install dos2unix on Linux if: runner.os == 'Linux' - working-directory: ${{ github.workspace }}/text-ui-test - run: ./runtest.sh + run: sudo apt-get update && sudo apt-get install -y dos2unix + + - name: Install dos2unix on macOS + if: runner.os == 'macOS' + run: brew install dos2unix - - name: Perform IO redirection test (MacOS) - if: always() && runner.os == 'macOS' - working-directory: ${{ github.workspace }}/text-ui-test + - name: Perform IO redirection test (*NIX or macOS) + if: runner.os == 'Linux' || runner.os == 'macOS' + working-directory: ${{ github.workspace }}/text-ui-test run: ./runtest.sh - name: Perform IO redirection test (Windows) if: always() && runner.os == 'Windows' - working-directory: ${{ github.workspace }}/text-ui-test + working-directory: ${{ github.workspace }}/text-ui-test shell: cmd run: runtest.bat \ No newline at end of file