From bef40336a51e8fe8c5bfe4cc3fdc99ac2bc154d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Fri, 19 Feb 2021 21:35:01 +0100 Subject: [PATCH] Merged actions into one file --- .github/workflows/{CheckMainFile.yml => CI.yml} | 12 +++++++++--- .github/workflows/ESLint.yml | 9 --------- 2 files changed, 9 insertions(+), 12 deletions(-) rename .github/workflows/{CheckMainFile.yml => CI.yml} (77%) delete mode 100644 .github/workflows/ESLint.yml diff --git a/.github/workflows/CheckMainFile.yml b/.github/workflows/CI.yml similarity index 77% rename from .github/workflows/CheckMainFile.yml rename to .github/workflows/CI.yml index cec3d89..d6a3644 100644 --- a/.github/workflows/CheckMainFile.yml +++ b/.github/workflows/CI.yml @@ -1,7 +1,13 @@ -name: Check build of CookieMonster.js -on: pull_request +name: CI +on: [push, pull_request] jobs: - build: + Check_ESLint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Run ESLint + run: npx eslint src + Check_main_file: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/ESLint.yml b/.github/workflows/ESLint.yml deleted file mode 100644 index 39fdf87..0000000 --- a/.github/workflows/ESLint.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: ESLint -on: [push, pull_request] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run ESLint - run: npx eslint src