From 431cc3b45b6e61a08791dd817dd84ad480167916 Mon Sep 17 00:00:00 2001 From: Conrad Date: Fri, 24 Jan 2020 09:37:22 +0100 Subject: [PATCH 1/2] Adjusted Workflows for new branching structure --- .github/workflows/cc.yml | 35 ++++++++++++++++++++++++++++++++++ .github/workflows/prettier.yml | 19 ------------------ 2 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/cc.yml delete mode 100644 .github/workflows/prettier.yml diff --git a/.github/workflows/cc.yml b/.github/workflows/cc.yml new file mode 100644 index 0000000..ae5e9bd --- /dev/null +++ b/.github/workflows/cc.yml @@ -0,0 +1,35 @@ +name: CodeCleanup + +on: [pull_request] + +jobs: + cleanup_tasks: + runs-on: ubuntu-latest + + steps: + - name: Cloning the repository + uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: Making Django Migrations + uses: creyD/makemigrations_action@master + with: + dependencypath: "requirements.txt" + branch: ${{ github.head_ref }} + managepath: "src/manage.py" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Applying PEP-8 to all files + uses: creyD/action_autopep8@master + with: + dependencies: "requirements.txt" + branch: ${{ github.head_ref }} + autoparameters: "--max-line-length 250 -a" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Prettify the JS Code + uses: creyD/prettier_action@master + with: + branch: ${{ github.head_ref }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml deleted file mode 100644 index 1bf8df8..0000000 --- a/.github/workflows/prettier.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Prettier for JS Code - -on: [push, pull_request] - -jobs: - cleanup_tasks: - runs-on: ubuntu-latest - - steps: - - name: Cloning the repository - uses: actions/checkout@master - with: - fetch-depth: 1 - - name: Prettify the JS Code - uses: creyD/prettier_action@master - with: - branch: ${{ github.head_ref }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 94a2b10bb3038b84c35570b192eb78eb11b3c8a9 Mon Sep 17 00:00:00 2001 From: Conrad Date: Fri, 24 Jan 2020 10:24:18 +0100 Subject: [PATCH 2/2] Added correct Workflow --- .github/workflows/cc.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/cc.yml b/.github/workflows/cc.yml index ae5e9bd..f7dae50 100644 --- a/.github/workflows/cc.yml +++ b/.github/workflows/cc.yml @@ -11,22 +11,6 @@ jobs: uses: actions/checkout@v1 with: fetch-depth: 1 - - name: Making Django Migrations - uses: creyD/makemigrations_action@master - with: - dependencypath: "requirements.txt" - branch: ${{ github.head_ref }} - managepath: "src/manage.py" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Applying PEP-8 to all files - uses: creyD/action_autopep8@master - with: - dependencies: "requirements.txt" - branch: ${{ github.head_ref }} - autoparameters: "--max-line-length 250 -a" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Prettify the JS Code uses: creyD/prettier_action@master with: