mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-22 07:37:43 +00:00
Push to LintRatchet instead, separate lint action
This commit is contained in:
parent
8843276c41
commit
54548fd8ae
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
@ -6,6 +6,7 @@ on:
|
||||
- "**.java"
|
||||
branches:
|
||||
- "stable"
|
||||
- "development"
|
||||
pull_request:
|
||||
paths:
|
||||
- "**.java"
|
||||
|
48
.github/workflows/build_lint.yml
vendored
48
.github/workflows/build_lint.yml
vendored
@ -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'
|
40
.github/workflows/lint_commit.yml
vendored
Normal file
40
.github/workflows/lint_commit.yml
vendored
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user