Skip to content

Commit

Permalink
Merge branch 'beta' into enchant-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
VixidDev authored Mar 1, 2024
2 parents bc3d61a + 53a1b5f commit bf6c976
Show file tree
Hide file tree
Showing 679 changed files with 15,136 additions and 4,911 deletions.
6 changes: 6 additions & 0 deletions .devauth/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
defaultEnabled = true
defaultAccount = "main"

[accounts.main]
type = "microsoft"

23 changes: 23 additions & 0 deletions .github/workflows/ban-imports.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Check banned imports
on:
- pull_request
- push
- workflow_dispatch
permissions: {}
jobs:
check-imports:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
name: Checkout code
- name: Check imports
run: |
while IFS=' ' read search banned; do
echo Banning $banned from $search
grep -nrE -- "import $banned" src/main/java/"$search"|sed -E 's/^(.*):([0-9]+):(.*)/::error file=\1,line=\2::Illegal \3/g'|tee -a temp
done<<<$(cat .github/workflows/illegal-imports.txt|sed -E 's/#.*//;/^$/d')
found=$(wc -l temp|cut -d ' ' -f 1)
echo Found "$found" invalid imports. Check the files tab for more information.
if [[ "$found" -ne 0 ]]; then
exit 1
fi
1 change: 1 addition & 0 deletions .github/workflows/generate-constants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: RepoPattern

env:
data_repo: hannibal002/SkyHanni-REPO
repo_action: true

on:
push:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/illegal-imports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Ban some packages from importing some other packages.
# Lines starting with # are ignored
# Every other line needs to be in the format
# <directory without src/main/java prefix> <illegal import>

at/hannibal2/skyhanni/ scala.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/
.idea/*
!.idea/icon.svg
.vscode/
run/
build/
Expand All @@ -9,5 +10,8 @@ build
gradle.properties
.gradle

#other
# other
.DS_STORE

.devauth/*
!.devauth/config.toml
21 changes: 21 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit bf6c976

Please sign in to comment.