From 79462669ca9745cd299c87d2422453ba0a21678e Mon Sep 17 00:00:00 2001 From: Faelayis <48393914+Faelayis@users.noreply.github.com> Date: Sun, 29 May 2022 02:59:07 +0700 Subject: [PATCH] Fix Update pre-release create new file --- .eslintignore | 3 +- .github/workflows/publish_pre_release.yml | 55 ++++++++++--------- .prettierignore | 3 +- bdbuilder.devlop.json | 4 +- package.json | 4 +- .../RPCPcStatus.plugin.js | 0 packagedev.json => pre-release/package.json | 0 script/releases.js | 6 +- src/changelog.json | 2 +- src/index.js | 4 +- 10 files changed, 42 insertions(+), 39 deletions(-) rename RPCPcStatus.devlop.js => pre-release/RPCPcStatus.plugin.js (100%) rename packagedev.json => pre-release/package.json (100%) diff --git a/.eslintignore b/.eslintignore index 7ef8321..6994be6 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1 @@ -RPCPcStatus.plugin.js -RPCPcStatus.devlop.js \ No newline at end of file +RPCPcStatus.plugin.js \ No newline at end of file diff --git a/.github/workflows/publish_pre_release.yml b/.github/workflows/publish_pre_release.yml index 299cc5d..d6ace39 100644 --- a/.github/workflows/publish_pre_release.yml +++ b/.github/workflows/publish_pre_release.yml @@ -63,7 +63,7 @@ jobs: id: bump_version run: | npm install -g version-bump-prompt - bump $bumprelease packagedev.json + bump $bumprelease ./pre-release/package.json - name: Install Dependencies run: npm install @@ -75,33 +75,33 @@ jobs: - uses: nyaa8/package-version@v1 id: package_version with: - path: "./packagedev.json" + path: "./pre-release/package.json" follow-symlinks: "false" - - name: Create Release - if: steps.package_version.outcome == 'success' - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: v${{ env.PACKAGE_VERSION }} - release_name: ${{ env.PACKAGE_VERSION }} - body: "##### ${{ env.bumprelease }}" - draft: false - prerelease: true + # - name: Create Release + # if: steps.package_version.outcome == 'success' + # id: create_release + # uses: actions/create-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: v${{ env.PACKAGE_VERSION }} + # release_name: ${{ env.PACKAGE_VERSION }} + # body: "##### ${{ env.bumprelease }}" + # draft: false + # prerelease: true - - name: Upload Release Asset - if: steps.create_release.outcome == 'success' - id: upload_release_asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./RPCPcStatus.devlop.js - asset_name: RPCPcStatus.plugin.js - asset_content_type: text/javascript + # - name: Upload Release Asset + # if: steps.create_release.outcome == 'success' + # id: upload_release_asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: ./pre-release/RPCPcStatus.plugin.js + # asset_name: RPCPcStatus.plugin.js + # asset_content_type: text/javascript - name: Automatically Commit Changed if: steps.upload_release_asset.outcome == 'success' @@ -114,3 +114,8 @@ jobs: commit_user_email: actions@github.com commit_author: GitHub Actions skip_checkout: true + + - name: Create/update tag + uses: rickstaa/action-create-tag@v1 + with: + tag: v${{ env.PACKAGE_VERSION }} diff --git a/.prettierignore b/.prettierignore index 27453dd..bf7e4af 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,2 @@ *.yml -RPCPcStatus.plugin.js -RPCPcStatus.devlop.js \ No newline at end of file +RPCPcStatus.plugin.js \ No newline at end of file diff --git a/bdbuilder.devlop.json b/bdbuilder.devlop.json index 9879f68..5ab629a 100644 --- a/bdbuilder.devlop.json +++ b/bdbuilder.devlop.json @@ -1,8 +1,8 @@ { "build": { "watch": false, - "output": "./", + "output": "./pre-release", "debug": true, - "filename": "RPCPcStatus.devlop.js" + "filename": "RPCPcStatus.plugin.js" } } diff --git a/package.json b/package.json index def9940..a881500 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "script:auth": "node ./script/authentication.js", "script:releases": "node ./script/releases.js", "publish_setup": "npm run script:releases && npm run npm-install && npm run prettier", - "script:publish_stable": " npm run publish_setup && npm run build && npm run build_dev && eslint ./RPCPcStatus.devlop.js ./RPCPcStatus.plugin.js --config .eslintrc.js --debug --fix", - "script:publish_prerelease": "npm run publish_setup && npm run build_dev && eslint ./RPCPcStatus.devlop.js --config .eslintrc.js --debug --fix && git checkout ./src/package.json" + "script:publish_stable": " npm run publish_setup && npm run build && npm run build_dev && eslint ./pre-release/RPCPcStatus.plugin.js ./RPCPcStatus.plugin.js --config .eslintrc.js --debug --fix", + "script:publish_prerelease": "npm run publish_setup && npm run build_dev && eslint ./pre-release/RPCPcStatus.plugin.js --config .eslintrc.js --debug --fix && git checkout ./src/package.json" }, "repository": { "type": "git", diff --git a/RPCPcStatus.devlop.js b/pre-release/RPCPcStatus.plugin.js similarity index 100% rename from RPCPcStatus.devlop.js rename to pre-release/RPCPcStatus.plugin.js diff --git a/packagedev.json b/pre-release/package.json similarity index 100% rename from packagedev.json rename to pre-release/package.json diff --git a/script/releases.js b/script/releases.js index 189a67c..12ec39d 100644 --- a/script/releases.js +++ b/script/releases.js @@ -2,7 +2,7 @@ const fs = require("fs"), ncu = require("npm-check-updates"), core = require("@actions/core"), editJsonFile = require("edit-json-file"), - package_directory = ["./../package.json", "./../packagedev.json", "./../src/package.json"], + package_directory = ["./../package.json", "./../pre-release/package.json", "./../src/package.json"], semVer = new RegExp( /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/gm, ); @@ -40,9 +40,9 @@ try { } }); } else if (process.env.bumprelease) { - fs.readFile("RPCPcStatus.devlop.js", "utf8", async (err, data) => { + fs.readFile("./pre-release/RPCPcStatus.devlop.js", "utf8", async (err, data) => { const version_old = await data.match(semVer)[0], - { version } = require("../packagedev.json"); + { version } = require("../pre-release/package.json"); core.notice(`RPC Pc Status devlop pre release ${version_old} -> ${version}`); core.info(`${process.env.bumpversion} Bump package version: ${version}`); await editJsonFile(`${__dirname}/./../src/package.json`, { diff --git a/src/changelog.json b/src/changelog.json index 4f1d93f..d7460cf 100644 --- a/src/changelog.json +++ b/src/changelog.json @@ -9,7 +9,7 @@ { "title": "Fixed", "type": "fixed", - "items": ["Settings premid are reset on restart discord", "Features show premid not working"] + "items": ["Fix Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"] }, { "title": "Improved", diff --git a/src/index.js b/src/index.js index 5b1c6d5..9e556cf 100644 --- a/src/index.js +++ b/src/index.js @@ -33,7 +33,7 @@ const changelog = { { title: "Fixed", type: "fixed", - items: ["Settings premid are reset on restart discord", "Features show premid not working"], + items: ["Fix Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"], }, { title: "Improved", @@ -97,7 +97,7 @@ export default class Plugin { ZLibrary.PluginUpdater.checkForUpdate?.( "RPCPcStatus", changelog.version, - "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/RPCPcStatus.devlop.js", + "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/pre-release/RPCPcStatus.plugin.js", ); } else { ZLibrary.PluginUpdater.checkForUpdate?.(