diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index eba681bc0..cce491350 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,12 +13,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_linux.sh - - name: Set up Java 8 uses: actions/setup-java@v1 with: @@ -42,12 +36,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_linux.sh - - name: Set up Java 8 uses: actions/setup-java@v1 with: diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index eee23b9af..f42884d7f 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -17,12 +17,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: cmd - run: | - cd BuildTools\FormatValidation - validate_format_win.bat - - name: Download Ninja uses: actions/checkout@master @@ -59,12 +53,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_linux.sh - - name: Download Ninja uses: actions/checkout@master @@ -91,7 +79,7 @@ jobs: build-macos: strategy: matrix: - config: [Debug, Release] + config: [Debug] runs-on: macos-latest name: Emscripten -> MacOS, ${{ matrix.config }} @@ -102,12 +90,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_mac.sh - - name: Download Ninja uses: actions/checkout@master diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 6781351e4..19bf790fc 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -17,12 +17,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_mac.sh - - name: Download Vulkan SDK if: success() shell: bash diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a7a03cc57..9a84b0090 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,12 +17,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_linux.sh - - name: Configure dependencies if: success() run: | @@ -75,12 +69,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_linux.sh - - name: Configure dependencies if: success() run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6c6912d19..f0adac9d5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,12 +17,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_mac.sh - - name: Download Vulkan SDK if: success() shell: bash diff --git a/.github/workflows/pre_checks.yml b/.github/workflows/pre_checks.yml new file mode 100644 index 000000000..7dbbc5169 --- /dev/null +++ b/.github/workflows/pre_checks.yml @@ -0,0 +1,49 @@ +name: Pre-checks + +on: [push, pull_request] + +jobs: + run-win10: + + runs-on: windows-latest + name: Win 10 -> Pre-checks + + steps: + - name: Clone repository + uses: actions/checkout@v2 + + - name: Format validation + shell: cmd + run: | + cd BuildTools\FormatValidation + validate_format_win.bat + + run-linux: + + runs-on: ubuntu-latest + name: Linux -> Pre-checks + + steps: + - name: Clone repository + uses: actions/checkout@v2 + + - name: Format validation + shell: bash + run: | + cd $GITHUB_WORKSPACE/BuildTools/FormatValidation + ./validate_format_linux.sh + + run-macos: + + runs-on: macos-latest + name: MacOS -> Pre-Checks + + steps: + - name: Clone repository + uses: actions/checkout@v2 + + - name: Format validation + shell: bash + run: | + cd $GITHUB_WORKSPACE/BuildTools/FormatValidation + ./validate_format_mac.sh diff --git a/.github/workflows/tvos.yml b/.github/workflows/tvos.yml index 2f28c7c90..224eab5db 100644 --- a/.github/workflows/tvos.yml +++ b/.github/workflows/tvos.yml @@ -17,12 +17,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: bash - run: | - cd $GITHUB_WORKSPACE/BuildTools/FormatValidation - ./validate_format_mac.sh - - name: Download Vulkan SDK if: success() shell: bash diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml index 671264a31..f4651b096 100644 --- a/.github/workflows/uwp.yml +++ b/.github/workflows/uwp.yml @@ -18,12 +18,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: cmd - run: | - cd BuildTools\FormatValidation - validate_format_win.bat - - name: Configure CMake if: success() shell: bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b336f0085..1dead83b4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,12 +18,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: cmd - run: | - cd BuildTools\FormatValidation - validate_format_win.bat - - name: Configure CMake if: success() shell: bash @@ -90,12 +84,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: cmd - run: | - cd BuildTools\FormatValidation - validate_format_win.bat - - name: Configure CMake if: success() shell: bash @@ -141,12 +129,6 @@ jobs: with: submodules: recursive - - name: Format validation - shell: cmd - run: | - cd BuildTools\FormatValidation - validate_format_win.bat - - name: Configure CMake if: success() shell: bash