From 6fdf0ec1dfd53b4fe4ffd5d3b38674a0a4b47ddc Mon Sep 17 00:00:00 2001 From: SimonB50 Date: Sat, 1 Mar 2025 16:46:04 +0100 Subject: [PATCH 1/5] Update dependencies to latest versions --- package.json | 2 +- pnpm-lock.yaml | 70 +++++++++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index d990c57..a902cd3 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "better-sqlite3": "^11.8.1", "chalk": "^5.4.1", "console-stamp": "^3.1.2", - "discord.js": "^14.17.3", + "discord.js": "^14.18.0", "fast-folder-size": "^2.4.0", "ms": "^2.1.3", "yaml": "^2.7.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 76efb14..4429e23 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^3.1.2 version: 3.1.2 discord.js: - specifier: ^14.17.3 - version: 14.17.3 + specifier: ^14.18.0 + version: 14.18.0 fast-folder-size: specifier: ^2.4.0 version: 2.4.0 @@ -39,8 +39,8 @@ importers: packages: - '@discordjs/builders@1.10.0': - resolution: {integrity: sha512-ikVZsZP+3shmVJ5S1oM+7SveUCK3L9fTyfA8aJ7uD9cNQlTqF+3Irbk2Y22KXTb3C3RNUahRkSInClJMkHrINg==} + '@discordjs/builders@1.10.1': + resolution: {integrity: sha512-OWo1fY4ztL1/M/DUyRPShB4d/EzVfuUvPTRRHRIt/YxBrUYSz0a+JicD5F5zHFoNs2oTuWavxCOVFV1UljHTng==} engines: {node: '>=16.11.0'} '@discordjs/collection@1.5.3': @@ -55,16 +55,16 @@ packages: resolution: {integrity: sha512-YIruKw4UILt/ivO4uISmrGq2GdMY6EkoTtD0oS0GvkJFRZbTSdPhzYiUILbJ/QslsvC9H9nTgGgnarnIl4jMfw==} engines: {node: '>=16.11.0'} - '@discordjs/rest@2.4.2': - resolution: {integrity: sha512-9bOvXYLQd5IBg/kKGuEFq3cstVxAMJ6wMxO2U3wjrgO+lHv8oNCT+BBRpuzVQh7BoXKvk/gpajceGvQUiRoJ8g==} + '@discordjs/rest@2.4.3': + resolution: {integrity: sha512-+SO4RKvWsM+y8uFHgYQrcTl/3+cY02uQOH7/7bKbVZsTfrfpoE62o5p+mmV+s7FVhTX82/kQUGGbu4YlV60RtA==} engines: {node: '>=18'} '@discordjs/util@1.1.1': resolution: {integrity: sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g==} engines: {node: '>=18'} - '@discordjs/ws@1.2.0': - resolution: {integrity: sha512-QH5CAFe3wHDiedbO+EI3OOiyipwWd+Q6BdoFZUw/Wf2fw5Cv2fgU/9UEtJRmJa9RecI+TAhdGPadMaEIur5yJg==} + '@discordjs/ws@1.2.1': + resolution: {integrity: sha512-PBvenhZG56a6tMWF/f4P6f4GxZKJTBG95n7aiGSPTnodmz4N5g60t79rSIAq7ywMbv8A4jFtexMruH+oe51aQQ==} engines: {node: '>=16.11.0'} '@isaacs/cliui@8.0.2': @@ -87,8 +87,8 @@ packages: resolution: {integrity: sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==} engines: {node: '>=v14.0.0', npm: '>=7.0.0'} - '@types/node@22.13.1': - resolution: {integrity: sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==} + '@types/node@22.13.8': + resolution: {integrity: sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ==} '@types/ws@8.5.14': resolution: {integrity: sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==} @@ -295,8 +295,8 @@ packages: discord-api-types@0.37.119: resolution: {integrity: sha512-WasbGFXEB+VQWXlo6IpW3oUv73Yuau1Ig4AZF/m13tXcTKnMpc/mHjpztIlz4+BM9FG9BHQkEXiPto3bKduQUg==} - discord.js@14.17.3: - resolution: {integrity: sha512-8/j8udc3CU7dz3Eqch64UaSHoJtUT6IXK4da5ixjbav4NAXJicloWswD/iwn1ImZEMoAV3LscsdO0zhBh6H+0Q==} + discord.js@14.18.0: + resolution: {integrity: sha512-SvU5kVUvwunQhN2/+0t55QW/1EHfB1lp0TtLZUSXVHDmyHTrdOj5LRKdR0zLcybaA15F+NtdWuWmGOX9lE+CAw==} engines: {node: '>=18'} eastasianwidth@0.2.0: @@ -355,8 +355,8 @@ packages: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} - foreground-child@3.3.0: - resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==} + foreground-child@3.3.1: + resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} engines: {node: '>=14'} fs-constants@1.0.0: @@ -720,8 +720,8 @@ packages: undici-types@6.20.0: resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} - undici@6.19.8: - resolution: {integrity: sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==} + undici@6.21.1: + resolution: {integrity: sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==} engines: {node: '>=18.17'} util-deprecate@1.0.2: @@ -743,8 +743,8 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - ws@8.18.0: - resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} + ws@8.18.1: + resolution: {integrity: sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -773,7 +773,7 @@ packages: snapshots: - '@discordjs/builders@1.10.0': + '@discordjs/builders@1.10.1': dependencies: '@discordjs/formatters': 0.6.0 '@discordjs/util': 1.1.1 @@ -791,7 +791,7 @@ snapshots: dependencies: discord-api-types: 0.37.119 - '@discordjs/rest@2.4.2': + '@discordjs/rest@2.4.3': dependencies: '@discordjs/collection': 2.1.1 '@discordjs/util': 1.1.1 @@ -801,21 +801,21 @@ snapshots: discord-api-types: 0.37.119 magic-bytes.js: 1.10.0 tslib: 2.8.1 - undici: 6.19.8 + undici: 6.21.1 '@discordjs/util@1.1.1': {} - '@discordjs/ws@1.2.0': + '@discordjs/ws@1.2.1': dependencies: '@discordjs/collection': 2.1.1 - '@discordjs/rest': 2.4.2 + '@discordjs/rest': 2.4.3 '@discordjs/util': 1.1.1 '@sapphire/async-queue': 1.5.5 '@types/ws': 8.5.14 '@vladfrangu/async_event_emitter': 2.4.6 discord-api-types: 0.37.119 tslib: 2.8.1 - ws: 8.18.0 + ws: 8.18.1 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -841,13 +841,13 @@ snapshots: '@sapphire/snowflake@3.5.3': {} - '@types/node@22.13.1': + '@types/node@22.13.8': dependencies: undici-types: 6.20.0 '@types/ws@8.5.14': dependencies: - '@types/node': 22.13.1 + '@types/node': 22.13.8 '@vladfrangu/async_event_emitter@2.4.6': {} @@ -1076,20 +1076,20 @@ snapshots: discord-api-types@0.37.119: {} - discord.js@14.17.3: + discord.js@14.18.0: dependencies: - '@discordjs/builders': 1.10.0 + '@discordjs/builders': 1.10.1 '@discordjs/collection': 1.5.3 '@discordjs/formatters': 0.6.0 - '@discordjs/rest': 2.4.2 + '@discordjs/rest': 2.4.3 '@discordjs/util': 1.1.1 - '@discordjs/ws': 1.2.0 + '@discordjs/ws': 1.2.1 '@sapphire/snowflake': 3.5.3 discord-api-types: 0.37.119 fast-deep-equal: 3.1.3 lodash.snakecase: 4.1.1 tslib: 2.8.1 - undici: 6.19.8 + undici: 6.21.1 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -1137,7 +1137,7 @@ snapshots: dependencies: to-regex-range: 5.0.1 - foreground-child@3.3.0: + foreground-child@3.3.1: dependencies: cross-spawn: 7.0.6 signal-exit: 4.1.0 @@ -1160,7 +1160,7 @@ snapshots: glob@10.4.5: dependencies: - foreground-child: 3.3.0 + foreground-child: 3.3.1 jackspeak: 3.4.3 minimatch: 9.0.5 minipass: 7.1.2 @@ -1512,7 +1512,7 @@ snapshots: undici-types@6.20.0: {} - undici@6.19.8: {} + undici@6.21.1: {} util-deprecate@1.0.2: {} @@ -1534,7 +1534,7 @@ snapshots: wrappy@1.0.2: {} - ws@8.18.0: {} + ws@8.18.1: {} xtend@4.0.2: {} From 3cedcc6b7f6bc6601697aa23518b8e2f50d374b0 Mon Sep 17 00:00:00 2001 From: SimonB50 Date: Sat, 1 Mar 2025 21:28:13 +0100 Subject: [PATCH 2/5] Added pterodactyl egg --- pterodactyl-egg.json | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 pterodactyl-egg.json diff --git a/pterodactyl-egg.json b/pterodactyl-egg.json new file mode 100644 index 0000000..9132f51 --- /dev/null +++ b/pterodactyl-egg.json @@ -0,0 +1,93 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2025-03-01T18:53:24+01:00", + "name": "BryanBot", + "author": "szymon.dawid@gmail.com", + "description": null, + "features": null, + "docker_images": { + "Node.js LTS": "ghcr.io\/parkervcp\/yolks:nodejs_22", + "Node.js Latest": "ghcr.io\/parkervcp\/yolks:nodejs_23" + }, + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}} {{STARTUP_FLAGS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"is ready to use!\"\r\n}", + "logs": "{}", + "stop": "^C^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# BryanBot Installation Script\r\n# Server Files: \/mnt\/server\r\n\r\n# Set BryanBot github repo url\r\nGIT_ADDRESS=\"https:\/\/github.com\/BryanBotDev\/BryanBot.git\"\r\n\r\n# Install dependencies\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python3 python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"Using anonymous git account\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## Pull BryanBot files\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \"Found .git directory\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"Loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"Files found with no git config\"\r\n echo -e \"Closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"Pulling latest release from GitHub\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"Cloning stable branch\"\r\n git clone -b stable ${GIT_ADDRESS} .\r\nfi\r\n\r\necho \"Installing Node.js packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install\r\nfi\r\n\r\necho -e \"Install complete\"\r\nexit 0", + "container": "node:18-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Auto Update BrayanBot", + "description": "Pull the latest files from BrayanBot's Github", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "Additional Node packages", + "description": "Install additional node packages. Use spaces to separate.", + "env_variable": "NODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "GitHub Username", + "description": "Username to auth with GitHub.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "GitHub Access Token", + "description": "Password to use with GitHub.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Main bot file", + "description": "The file that starts the bot.", + "env_variable": "BOT_JS_FILE", + "default_value": "src\/index.js", + "user_viewable": true, + "user_editable": false, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Startup Parameters", + "description": "", + "env_variable": "STARTUP_FLAGS", + "default_value": "--show-errors --reset-slashCommands", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + } + ] +} \ No newline at end of file From 8ea1dd95d8601080ad725ba231d635e205702c19 Mon Sep 17 00:00:00 2001 From: SimonB50 Date: Sat, 1 Mar 2025 21:28:28 +0100 Subject: [PATCH 3/5] Updated github actions --- .github/workflows/nodejs.yml | 137 ++++++++++++++---------------- .github/workflows/pre-release.yml | 38 --------- .github/workflows/release.yml | 26 ++---- .github/workflows/test.yml | 45 ---------- 4 files changed, 72 insertions(+), 174 deletions(-) delete mode 100644 .github/workflows/pre-release.yml delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index f09e4f1..7dba29e 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -3,82 +3,73 @@ name: Node.js CI on: - push: - paths-ignore: - - 'README.md' - - '.github/**' - - '.dockerignore' - - 'docker-compose.yml' - - 'Dockerfile' - branches: - - main - pull_request: - paths-ignore: - - 'README.md' - - '.github/**' - - '.dockerignore' - - 'docker-compose.yml' - - 'Dockerfile' - branches: - - main - schedule: - # execute once every monday - - cron: "0 0 * * MON" + push: + paths-ignore: + - "README.md" + - ".github/**" + - ".dockerignore" + - "docker-compose.yml" + - "Dockerfile" + branches: + - dev + schedule: + # execute once every monday + - cron: "0 0 * * 1" jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 - - name: Install Node v16 - uses: actions/setup-node@v2 - with: - node-version: 16 - - - uses: pnpm/action-setup@v2 - name: Install pnpm - id: pnpm-install - with: - version: 7 - run_install: false + - name: Install Node v22 + uses: actions/setup-node@v4 + with: + node-version: 22 - - name: Get pnpm store directory - id: pnpm-cache - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT + - uses: pnpm/action-setup@v4 + name: Install pnpm + id: pnpm-install + with: + version: 10 + run_install: false - - uses: actions/cache@v3 - name: Setup pnpm cache - with: - path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + - name: Get pnpm store directory + id: pnpm-cache + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - name: Install dependencies - run: pnpm install - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - strategy: - fail-fast: false - matrix: - language: ["javascript"] - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 \ No newline at end of file + - uses: actions/cache@v4 + name: Setup pnpm cache + with: + path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + + - name: Install dependencies + run: pnpm install + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + strategy: + fail-fast: false + matrix: + language: ["javascript"] + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml deleted file mode 100644 index 3b66161..0000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Dev Branch CI - -on: - push: - branches: ["dev/*"] - -jobs: - release-dev: - name: Publish in-dev release - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - # Set Variables - - name: Set variables - id: vars - run: echo ::set-output name=version::${GITHUB_REF#refs/*\/dev/} - - # Zip up everything excluding Dockerfile and docker-compose.yml - - name: Archive Source code - run: zip -r BryanBot-v${{ steps.vars.outputs.version }}.zip * -x Dockerfile docker-compose.yml Dockerignore - - # Fetch pterodactyl egg - - name: Receive Pterodactyl Egg - run: wget -O pterodacytl-egg.json https://cdn.zorino.in/egg-bryanbot-bot.json - - # Create a prerelease - - uses: "marvinpinto/action-automatic-releases@latest" - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "${{ steps.vars.outputs.version }}-DEV" - prerelease: true - title: "Development Build (${{ steps.vars.outputs.version }})" - files: | - BryanBot-*.zip - Dockerfile - docker-compose.yml - pterodacytl-egg.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6958a56..9b1dd2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,36 +10,26 @@ jobs: name: Public Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - # Set Variables - name: Set variables id: vars run: echo ::set-output name=version::${GITHUB_REF#refs/tags/v} - # Zip up necessary files - name: Archive Source code - run: zip -r BryanBot-v${{ steps.vars.outputs.version }}.zip * -x Dockerfile docker-compose.yml Dockerignore + run: zip -r BryanBot-v${{ steps.vars.outputs.version }}.zip * -x Dockerfile docker-compose.yml - # Fetch the pterodactyl egg - - name: Receive Pterodactyl Egg - run: wget -O pterodactyl-egg.json https://cdn.zorino.in/egg-bryanbot-bot.json - - # Generate checksums for all files and log them to the appropriate file - name: Generate Checksums run: | - md5sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > md5-checksums.txt - sha256sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > sha256-checksums.txt - sha512sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > sha512-checksums.txt - # Release Public Build - - uses: "marvinpinto/action-automatic-releases@latest" + md5sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json > md5-checksums.txt + sha256sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json > sha256-checksums.txt + sha512sum BryanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json > sha512-checksums.txt + + - uses: "softprops/action-gh-release@v2" with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" + name: "BryanBot v${{ steps.vars.outputs.version }}" prerelease: false - title: "BryanBot v${{ steps.vars.outputs.version }}" files: | BryanBot-*.zip pterodactyl-egg.json - Dockerfile - docker-compose.yml *-checksums.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 6185079..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: "Automated Test CI" - -on: - workflow_dispatch - -env: - BOT_TOKEN: ${{ secrets.BOT_TEST_TOKEN }} - -jobs: - test_job: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Install Node v16 - uses: actions/setup-node@v2 - with: - node-version: 16 - - - uses: pnpm/action-setup@v2 - name: Install pnpm - id: pnpm-install - with: - version: 7 - run_install: false - - - name: Get pnpm store directory - id: pnpm-cache - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - name: Setup pnpm cache - with: - path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: "Take the bot on a test run" - run: | - export ENV_TOKEN="${BOT_TOKEN}" - chmod +x ./.github/scripts/audit.sh - ./.github/scripts/audit.sh \ No newline at end of file From 8472c48d8c60b8fd8f741ab5473fa316a83706e9 Mon Sep 17 00:00:00 2001 From: SimonB50 Date: Sat, 1 Mar 2025 21:36:55 +0100 Subject: [PATCH 4/5] Changed release action config to generate drafts --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b1dd2f..0f254f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,7 @@ jobs: with: name: "BryanBot v${{ steps.vars.outputs.version }}" prerelease: false + draft: true files: | BryanBot-*.zip pterodactyl-egg.json From 6d107825682e6784b7263f16c15947e6c321135f Mon Sep 17 00:00:00 2001 From: SimonB50 Date: Sun, 2 Mar 2025 11:35:28 +0100 Subject: [PATCH 5/5] Removed console.log from backups --- src/Modules/Structures/Handlers/Backup.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Modules/Structures/Handlers/Backup.js b/src/Modules/Structures/Handlers/Backup.js index e859d15..a812e94 100644 --- a/src/Modules/Structures/Handlers/Backup.js +++ b/src/Modules/Structures/Handlers/Backup.js @@ -40,7 +40,6 @@ export class BackupHandler { setInterval(() => { this.takeBackup() .then(([result, output]) => { - console.log(output); if (result) this.manager.logger.debug( `${prefix} Backup completed successfully. ${chalk.green(