diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 640581ffc..fb5324141 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ on: - "**.java" branches: - "stable" + - "development" pull_request: paths: - "**.java" diff --git a/.github/workflows/build_lint.yml b/.github/workflows/build_lint.yml deleted file mode 100644 index 22b5aea24..000000000 --- a/.github/workflows/build_lint.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: "Lint and Build" -on: - workflow_dispatch: ~ - push: - paths: - - "**.java" - branches: - - "development" -jobs: - Build-Server-Jar: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - name: Run Linter - run: python format_whitespace.py - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: '17' - - name: Cache gradle files - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - ./.gradle/loom-cache - key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Run Gradle - run: ./gradlew && ./gradlew jar - - name: Upload build - uses: actions/upload-artifact@v3 - with: - name: Grasscutter - path: grasscutter-*.jar - - name: Commit any Linter changes - uses: EndBug/add-and-commit@v9 - with: - add: '-u' - default_author: github_actions - message: 'Fix whitespace' diff --git a/.github/workflows/lint_commit.yml b/.github/workflows/lint_commit.yml new file mode 100644 index 000000000..99721641e --- /dev/null +++ b/.github/workflows/lint_commit.yml @@ -0,0 +1,40 @@ +name: "Lint whitespace and languages" +on: + workflow_dispatch: ~ + push: + paths: + - "**.java" + - "**.json" + branches: + - "development" +jobs: + Build-Server-Jar: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: Run Whitespace Linter + run: python format_whitespace.py + - run: git config --global user.name "github-actions" + - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + - run: git stash + # - name: Remove Whitespace Linter's LintRatchet ref + # run: git branch -D LintRatchet + # - name: Fetch this repo's LintRatchet branch + # run: git fetch origin LintRatchet:LintRatchet + - run: git checkout LintRatchet + - run: git merge development + - run: git stash pop + - run: git add -u + - run: git commit -m 'Fix whitespace [skip actions]' + - name: Update Languages + run: python manage_languages.py -u + - run: git add -u + - run: git commit -m 'Update languages [skip actions]' + - run: git push --set-upstream origin LintRatchet