Skip to content
This repository has been archived by the owner on Jun 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #391 from Stuyk/alpha/5.0.0
Browse files Browse the repository at this point in the history
alpha/5.0.0
  • Loading branch information
Stuyk committed Mar 31, 2023
2 parents 86d18f6 + d18d8cd commit acd5f2f
Show file tree
Hide file tree
Showing 2,225 changed files with 155,558 additions and 37,385 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# These are supported funding model platforms

github: [stuyk]
patreon: [stuyk]
29 changes: 29 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
on:
push:
jobs:
# Build job
build:
if: github.actor == 'stuyk'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Setup NodeJS
uses: actions/setup-node@v3
- name: Install and Build 🔧
run: |
npm install
npm run docs
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: docs
- name: Invoke Documentation Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: deploy.yml
repo: stuyk/athena-docs-latest
token: ${{ secrets.DOCS_PAT }}
ref: 'main'
19 changes: 0 additions & 19 deletions .github/workflows/pull_request.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dist-ssr
server.cfg
server.toml
doc
typedoc.json
!scripts/streamer/dist
package-lock.json

Expand All @@ -39,6 +38,8 @@ src-webviews/public/plugins/*
!src-webviews/public/plugins/*/.gitkeep
src/core/plugins/private-*
src/core/plugins/athena-plugin-*
src/core/plugins/sandbox*
docs/

# Yarn stuff
.yarn/
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@
".github": false,
"resources/core/**": false,
"CONTRIBUTING.md": true
}
},
"css.lint.unknownProperties": "ignore",
"docify.commentService.docstringFormat": "JsDoc",
"docify.commentService.programmingLanguage": "javascript"
}
2 changes: 0 additions & 2 deletions AthenaConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
"MONGO_URL": null,
"[?] Used for Framework custom Database": "TYPE IS STRING",
"MONGO_DATABASE_NAME": null,
"[?] Used for Ares Service Debugging": "TYPE IS STRING",
"ARES_ENDPOINT": null,
"[?] Use altv built-in reconnect?": "TYPE IS BOOLEAN",
"USE_ALTV_RECONNECT": true
}
Loading

0 comments on commit acd5f2f

Please sign in to comment.