Skip to content

Commit

Permalink
GitHub actions: moved format validation to a separate action
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMostDiligent committed Sep 22, 2021
1 parent 1044d47 commit 9f74bc6
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 85 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -91,7 +79,7 @@ jobs:
build-macos:
strategy:
matrix:
config: [Debug, Release]
config: [Debug]

runs-on: macos-latest
name: Emscripten -> MacOS, ${{ matrix.config }}
Expand All @@ -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

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/pre_checks.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 0 additions & 6 deletions .github/workflows/tvos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/uwp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9f74bc6

Please sign in to comment.