Skip to content

Commit

Permalink
Merge branch 'beta' into bridge-formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
CalMWolfs authored Oct 20, 2024
2 parents c2ed11e + 8ce3e9d commit f2e4ae7
Show file tree
Hide file tree
Showing 896 changed files with 28,732 additions and 8,953 deletions.
13 changes: 13 additions & 0 deletions .github/actions/setup-normal-workspace/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Setup Java, Gradle and check out the source code'

runs:
using: composite
steps:
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
cache: gradle
- name: Setup gradle
uses: gradle/actions/setup-gradle@v4
37 changes: 37 additions & 0 deletions .github/scripts/process_detekt_sarif.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

# This script processes the Detekt SARIF file and outputs results in a format
# suitable for annotation in CI/CD systems.

SARIF_FILE="$1"

# Check if SARIF file exists
if [ ! -f "$SARIF_FILE" ]; then
echo "SARIF file not found: $SARIF_FILE"
exit 1
fi

# Define jq command to parse SARIF file
read -r -d '' jq_command <<'EOF'
.runs[].results[] |
{
"full_path": .locations[].physicalLocation.artifactLocation.uri | sub("file://$(pwd)/"; ""),
"file_name": (.locations[].physicalLocation.artifactLocation.uri | split("/") | last),
"l": .locations[].physicalLocation,
"level": .level,
"message": .message.text,
"ruleId": .ruleId
} |
(
"::" + (.level) +
" file=" + (.full_path) +
",line=" + (.l.region.startLine|tostring) +
",title=" + (.ruleId) +
",col=" + (.l.region.startColumn|tostring) +
",endColumn=" + (.l.region.endColumn|tostring) +
"::" + (.message)
)
EOF

# Run jq command to format the output
jq -r "$jq_command" < "$SARIF_FILE"
64 changes: 64 additions & 0 deletions .github/workflows/assign-relevant-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: "Assign relevant labels"
on:
pull_request_target:
types: [ opened, edited ]
jobs:
assign-label:
if: github.event.pull_request.state == 'open'
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
contents: read
steps:
- name: label
env:
TITLE: ${{ github.event.pull_request.title }}
LABEL_FIX: Bug Fix
LABEL_BACKEND: Backend
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN}}
script: |
const labelsToAdd = [];
const labelsToRemove = [];
const title = process.env.TITLE.split(":")[0].toUpperCase();
if(title.includes("FIX")){
labelsToAdd.push(process.env.LABEL_FIX);
} else {
labelsToRemove.push(process.env.LABEL_FIX);
}
if(title.includes("BACKEND")){
labelsToAdd.push(process.env.LABEL_BACKEND);
} else {
labelsToRemove.push(process.env.LABEL_BACKEND);
}
for (const label of labelsToAdd) {
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: [label]
});
}
const {data} = await github.rest.issues.listLabelsOnIssue({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
});
for (const label of labelsToRemove) {
const filtered = data.filter(l => l.name == label);
if(filtered.length == 1){
github.rest.issues.removeLabel({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
name: label
});
}
}
49 changes: 28 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,50 @@ jobs:
runs-on: ubuntu-latest
name: "Build and test"
steps:
- uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 21
distribution: temurin
cache: gradle
- name: Setup gradle
uses: gradle/gradle-build-action@v2
- name: Checkout code
uses: actions/checkout@v4
- uses: ./.github/actions/setup-normal-workspace
- name: Build with Gradle
run: ./gradlew assemble -x test --stacktrace
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: Upload development build
with:
name: "Development Build"
path: versions/1.8.9/build/libs/*.jar
path: build/libs/*.jar
- name: Test with Gradle
run: ./gradlew test
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: "Upload test report"
if: ${{ !cancelled() }}
with:
name: "Test Results"
path: versions/1.8.9/build/reports/tests/test/
detekt:
name: Run detekt
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4
- uses: ./.github/actions/setup-normal-workspace
# detektMain is a LOT slower than detekt, but it does type analysis
- name: Run detekt main (w/typing analysis)
run: |
./gradlew detektMain --stacktrace
- name: Annotate detekt failures
if: ${{ !cancelled() }}
run: |
chmod +x .github/scripts/process_detekt_sarif.sh
./.github/scripts/process_detekt_sarif.sh versions/1.8.9/build/reports/detekt/main.sarif

preprocess:
runs-on: ubuntu-latest
name: "Build multi version"
steps:
- uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 21
distribution: temurin
cache: gradle
- name: Setup gradle
uses: gradle/gradle-build-action@v2
- name: Checkout code
uses: actions/checkout@v4
- uses: ./.github/actions/setup-normal-workspace
- name: Enable preprocessor
run: |
mkdir -p .gradle
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/check-style.yaml.disabled

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/generate-constants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Generate Repo Patterns using Gradle
run: |
./gradlew generateRepoPatterns --stacktrace
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: Upload generated repo regexes
with:
name: Repo Regexes
Expand All @@ -45,7 +45,7 @@ jobs:
with:
repository: ${{ env.data_repo }}
branch: main
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
name: Upload generated repo regexes
with:
name: Repo Regexes
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/illegal-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

at/hannibal2/skyhanni/ scala.
at/hannibal2/skyhanni/ jline.
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.SlotClickEvent
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.ReplaceItemEvent
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Utils
at/hannibal2/skyhanni/ java.util.function.Supplier
44 changes: 0 additions & 44 deletions .github/workflows/label-bug-fix.yml

This file was deleted.

57 changes: 57 additions & 0 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: "PR Changelog Verification"

on:
pull_request_target:
types: [ opened, edited, ready_for_review ]

jobs:
verify-changelog:
if: github.event.pull_request.state == 'open' && '511310721' == github.repository_id && github.event.pull_request.draft == false
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- uses: ./.github/actions/setup-normal-workspace

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run ChangeLog verification
env:
PR_TITLE: ${{ github.event.pull_request.title }}
PR_BODY: ${{ github.event.pull_request.body }}
run: |
./gradlew checkPrDescription -PprTitle="${PR_TITLE}" -PprBody="${PR_BODY}"
- name: Add label if changelog verification fails
if: failure()
uses: actions-ecosystem/action-add-labels@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
labels: 'Wrong Title/Changelog'

- name: Remove label if changelog verification passes
if: success()
uses: actions-ecosystem/action-remove-labels@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
labels: 'Wrong Title/Changelog'

- name: Add comment to PR if changelog verification fails
if: failure()
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const fs = require('fs');
const test = fs.readFileSync('versions/1.8.9/build/changelog_errors.txt', 'utf8');
const commentBody = `${test}`
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: commentBody
})
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
!.idea/icon.svg
!.idea/dictionaries/default_user.xml
!.idea/scopes/Mixins.xml
!.idea/liveTemplates/SkyHanni.xml
.vscode/
run/
build/
Expand Down
Loading

0 comments on commit f2e4ae7

Please sign in to comment.