mirror of
https://github.com/Equicord/Equicord.git
synced 2025-01-18 21:33:35 -05:00
Updates And Fixes
This commit is contained in:
thororen1234
parent
8172468fba
commit
d84b833bc4
5 changed files with 138 additions and 92 deletions
182
.github/workflows/build.yml
vendored
182
.github/workflows/build.yml
vendored
|
|
@ -1,111 +1,113 @@
|
|||
name: Release
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- .github/workflows/build.yml
|
||||
- src/**
|
||||
- browser/**
|
||||
- scripts/build/**
|
||||
- package.json
|
||||
- pnpm-lock.yaml
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- .github/workflows/build.yml
|
||||
- src/**
|
||||
- browser/**
|
||||
- scripts/build/**
|
||||
- package.json
|
||||
- pnpm-lock.yaml
|
||||
env:
|
||||
FORCE_COLOR: true
|
||||
GITHUB_TOKEN: ${{ secrets.ETOKEN }}
|
||||
FORCE_COLOR: true
|
||||
GITHUB_TOKEN: ${{ secrets.ETOKEN }}
|
||||
|
||||
jobs:
|
||||
DetermineRunner:
|
||||
name: Determine Runner
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
runner: ${{ steps.set-runner.outputs.runner }}
|
||||
steps:
|
||||
- name: Determine which runner to use
|
||||
id: set-runner
|
||||
uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0
|
||||
with:
|
||||
primary-runner: "self-hosted"
|
||||
fallback-runner: "ubuntu-latest"
|
||||
min-available-runners: 1
|
||||
github-token: ${{ env.GITHUB_TOKEN }}
|
||||
DetermineRunner:
|
||||
name: Determine Runner
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
runner: ${{ steps.set-runner.outputs.runner }}
|
||||
steps:
|
||||
- name: Determine which runner to use
|
||||
id: set-runner
|
||||
uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0
|
||||
with:
|
||||
primary-runner: "self-hosted"
|
||||
fallback-runner: "ubuntu-latest"
|
||||
min-available-runners: 1
|
||||
github-token: ${{ env.GITHUB_TOKEN }}
|
||||
|
||||
Build:
|
||||
name: Build Equicord
|
||||
needs: DetermineRunner
|
||||
runs-on: ${{ needs.DetermineRunner.outputs.runner}}
|
||||
Build:
|
||||
name: Build Equicord
|
||||
needs: DetermineRunner
|
||||
runs-on: ${{ needs.DetermineRunner.outputs.runner}}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
|
||||
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
|
||||
|
||||
- name: Use Node.js 20
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20
|
||||
cache: "pnpm"
|
||||
- name: Use Node.js 20
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20
|
||||
cache: "pnpm"
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
||||
- name: Build web
|
||||
run: pnpm buildWebStandalone
|
||||
- name: Build web
|
||||
run: pnpm buildWebStandalone
|
||||
|
||||
- name: Build
|
||||
run: pnpm build --standalone
|
||||
- name: Build
|
||||
run: pnpm build --standalone
|
||||
|
||||
- name: Generate plugin list
|
||||
run: pnpm generatePluginJson dist/plugins.json dist/plugin-readmes.json
|
||||
- name: Generate plugin list
|
||||
run: pnpm generatePluginJson dist/plugins.json dist/plugin-readmes.json
|
||||
|
||||
- name: Generate Equicord plugin list
|
||||
run: pnpm generateEquicordPluginJson dist/equicordplugins.json
|
||||
- name: Generate Equicord plugin list
|
||||
run: pnpm generateEquicordPluginJson dist/equicordplugins.json
|
||||
|
||||
- name: Collect files to be released
|
||||
run: |
|
||||
cd dist
|
||||
mkdir release
|
||||
- name: Collect files to be released
|
||||
run: |
|
||||
cd dist
|
||||
mkdir release
|
||||
|
||||
cp browser/browser.* release
|
||||
cp Vencord.user.{js,js.LEGAL.txt} release
|
||||
cp browser/browser.* release
|
||||
cp Vencord.user.{js,js.LEGAL.txt} release
|
||||
|
||||
# copy the plugin data jsons, the extension zips and the desktop/vesktop asars
|
||||
cp *.{json,zip,asar} release
|
||||
# copy the plugin data jsons, the extension zips and the desktop/vesktop asars
|
||||
cp *.{json,zip,asar} release
|
||||
|
||||
# legacy un-asared files
|
||||
# FIXME: remove at some point
|
||||
cp desktop/* release
|
||||
for file in vesktop/*; do
|
||||
filename=$(basename "$file")
|
||||
cp "$file" "release/vencordDesktop${filename^}"
|
||||
done
|
||||
for file in equibop/*; do
|
||||
filename=$(basename "$file")
|
||||
cp "$file" "release/equicordDesktop${filename^}"
|
||||
done
|
||||
# legacy un-asared files
|
||||
# FIXME: remove at some point
|
||||
cp desktop/* release
|
||||
for file in vesktop/*; do
|
||||
filename=$(basename "$file")
|
||||
cp "$file" "release/vencordDesktop${filename^}"
|
||||
done
|
||||
for file in equibop/*; do
|
||||
filename=$(basename "$file")
|
||||
cp "$file" "release/equicordDesktop${filename^}"
|
||||
done
|
||||
|
||||
find release -size 0 -delete
|
||||
rm release/package.json
|
||||
rm release/*.map
|
||||
find release -size 0 -delete
|
||||
rm release/package.json
|
||||
rm release/*.map
|
||||
|
||||
- name: Upload Equicord
|
||||
if: github.repository == 'Equicord/Equicord'
|
||||
run: |
|
||||
gh release upload latest --clobber dist/release/*
|
||||
- name: Upload Equicord
|
||||
if: github.repository == 'Equicord/Equicord'
|
||||
run: |
|
||||
gh release upload latest --clobber dist/release/*
|
||||
|
||||
- name: Upload Plugins JSON to Ignore repo
|
||||
if: github.repository == 'Equicord/Equicord'
|
||||
run: |
|
||||
git config --global user.name "$USERNAME"
|
||||
git config --global user.email "78185467+thororen1234@users.noreply.github.com"
|
||||
git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git upload
|
||||
cd upload
|
||||
rm plugins.json
|
||||
cp -r ../dist/equicordplugins.json plugins.json
|
||||
git add -A
|
||||
git commit -m "Plugins for https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA"
|
||||
git push --force https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git
|
||||
env:
|
||||
API_TOKEN: ${{ secrets.ETOKEN }}
|
||||
GH_REPO: Equicord/Equibored
|
||||
USERNAME: thororen1234
|
||||
- name: Upload Plugins JSON to Ignore repo
|
||||
if: github.repository == 'Equicord/Equicord'
|
||||
run: |
|
||||
git config --global user.name "$USERNAME"
|
||||
git config --global user.email "78185467+thororen1234@users.noreply.github.com"
|
||||
git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git upload
|
||||
cd upload
|
||||
rm plugins.json
|
||||
cp -r ../dist/equicordplugins.json plugins.json
|
||||
git add -A
|
||||
git commit -m "Plugins for https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA"
|
||||
git push --force https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git
|
||||
env:
|
||||
API_TOKEN: ${{ secrets.ETOKEN }}
|
||||
GH_REPO: Equicord/Equibored
|
||||
USERNAME: thororen1234
|
||||
|
|
|
|||
3
.github/workflows/reportBrokenPlugins.yml
vendored
3
.github/workflows/reportBrokenPlugins.yml
vendored
|
|
@ -15,7 +15,8 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
if: ${{ github.event_name == 'schedule' }}
|
||||
with:
|
||||
ref: dev
|
||||
ref: dev
|
||||
submodules: "recursive"
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
if: ${{ github.event_name == 'workflow_dispatch' }}
|
||||
|
|
|
|||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
|
|
@ -36,6 +36,8 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: "recursive"
|
||||
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
|
||||
|
||||
- name: Use Node.js 20
|
||||
|
|
@ -63,6 +65,8 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: "recursive"
|
||||
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
|
||||
|
||||
- name: Use Node.js 20
|
||||
|
|
|
|||
39
.gitmodules
vendored
Normal file
39
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
[submodule "src/equicordplugins/baseDecoder"]
|
||||
path = src/equicordplugins/baseDecoder
|
||||
url = https://github.com/ThePirateStoner/vencord-base64-decoder
|
||||
[submodule "src/equicordplugins/betterActivities"]
|
||||
path = src/equicordplugins/betterActivities
|
||||
url = https://github.com/D3SOX/vc-betterActivities
|
||||
[submodule "src/equicordplugins/blockKrisp"]
|
||||
path = src/equicordplugins/blockKrisp
|
||||
url = https://github.com/D3SOX/vc-blockKrisp.git
|
||||
[submodule "src/equicordplugins/ignoreTerms"]
|
||||
path = src/equicordplugins/ignoreTerms
|
||||
url = https://github.com/D3SOX/vc-ignoreTerms.git
|
||||
[submodule "src/equicordplugins/notifyUserChanges"]
|
||||
path = src/equicordplugins/notifyUserChanges
|
||||
url = https://github.com/D3SOX/vc-notifyUserChanges
|
||||
[submodule "src/equicordplugins/voiceChatUtils"]
|
||||
path = src/equicordplugins/voiceChatUtils
|
||||
url = https://github.com/D3SOX/vc-voiceChatUtilities
|
||||
[submodule "src/equicordplugins/customSounds"]
|
||||
path = src/equicordplugins/customSounds
|
||||
url = https://github.com/ScattrdBlade/customSounds
|
||||
[submodule "src/equicordplugins/newPluginsManager"]
|
||||
path = src/equicordplugins/newPluginsManager
|
||||
url = https://github.com/Sqaaakoi/vc-newPluginsManager.git
|
||||
[submodule "src/equicordplugins/replaceActivityTypes"]
|
||||
path = src/equicordplugins/replaceActivityTypes
|
||||
url = https://github.com/nyakowint/replaceActivityTypes.git
|
||||
[submodule "src/equicordplugins/sekaiStickers"]
|
||||
path = src/equicordplugins/sekaiStickers
|
||||
url = https://codeberg.org/maikokain/sekaistickers-vencord.git
|
||||
[submodule "src/equicordplugins/gensokyoRadioRPC"]
|
||||
path = src/equicordplugins/gensokyoRadioRPC
|
||||
url = https://github.com/ForkPrince/GensokyoRadioRPC.git
|
||||
[submodule "src/equicordplugins/holyNotes"]
|
||||
path = src/equicordplugins/holyNotes
|
||||
url = https://github.com/WolfPlugs/HolyNotes-VC.git
|
||||
[submodule "src/equicordplugins/themeLibrary"]
|
||||
path = src/equicordplugins/themeLibrary
|
||||
url = https://github.com/Faf4a/ThemeLibrary
|
||||
|
|
@ -33,7 +33,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
|
|||
- BetterQuickReact by Ven and Sqaaakoi
|
||||
- BetterUserArea by Samwich
|
||||
- BlockKeywords by catcraft
|
||||
- BlockKrsip by D3SOX
|
||||
- BlockKrisp by D3SOX
|
||||
- BypassDND by Inbestigator
|
||||
- CleanChannelName by AutumnVN
|
||||
- ClientSideBlock by Samwich
|
||||
|
|
|
|||
Loading…
Reference in a new issue