Creepso/multi-downloader-nx
1
0
Fork 0
Code Issues 38 Pull requests 10 Projects Releases 70 Packages Wiki Activity Actions

Bug fixes

Browse source
This commit is contained in:
Izuco 2022-02-15 20:19:45 +01:00
parent 0a948788a4
commit f85753fd9b
No known key found for this signature in database
GPG key ID: E9CBE9E4EF3A1BFA
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/release-matrix.yml vendored
View file

@ -18,13 +18,12 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 16
check-latest: true
- name: Install Node modules
run: |
npm install
cd gui/react && npm install
- name: Get name and version from package.json
run: |
@ -39,8 +38,8 @@ jobs:
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ github.event.release.upload_url }}
asset_name: ${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ env.BUILD_TYPE }}.7z
asset_path: ./lib/_builds/${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ env.BUILD_TYPE }}.7z
asset_name: ${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ matrix.build_type }}.7z
asset_path: ./lib/_builds/${{ env.PACKAGE_NAME }}-${{ env.PACKAGE_VERSION }}-${{ matrix.build_type }}64.7z
asset_content_type: application/x-7z-compressed
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

6
modules/build.ts
View file

@ -26,7 +26,7 @@ async function buildGUI() {
// main
async function buildBinary(buildType: string) {
const buildStr = `${pkg.name}-${pkg.version}`;
const acceptableBuilds = ['win64','linux64','macos64'];
const acceptableBuilds = ['windows64','ubuntu64','macos64'];
if(!acceptableBuilds.includes(buildType)){
console.error('[ERROR] unknown build type!');
process.exit(1);
@ -72,9 +72,9 @@ async function buildBinary(buildType: string) {
function getTarget(bt: string) : string {
switch(bt){
case 'win64':
case 'windows64':
return 'windows-x64';
case 'linux64':
case 'ubuntu64':
return 'linux-x64';
case 'macos64':
return 'macos-x64';

12
package.json
View file

@ -79,19 +79,19 @@
"prebuild-windows-false": "npm run tsc false false",
"prebuild-ubuntu-false": "npm run tsc false false",
"prebuild-macos-false": "npm run tsc false false",
"build-windows-false": "cd lib && node modules/build win64",
"build-ubuntu-false": "cd lib && node modules/build linux64",
"build-windows-false": "cd lib && node modules/build windows64",
"build-ubuntu-false": "cd lib && node modules/build ubuntu64",
"build-macos-false": "cd lib && node modules/build macos64",
"prebuild-windows-true": "npm run tsc",
"prebuild-ubuntu-true": "npm run tsc",
"prebuild-macos-true": "npm run tsc",
"build-windows-true": "cd lib && node modules/build true",
"build-ubuntu-true": "cd lib && node modules/build true",
"build-macos-true": "cd lib && node modules/build true",
"build-windows-true": "cd lib && node modules/build notNeeded true",
"build-ubuntu-true": "cd lib && node modules/build notNeeded true",
"build-macos-true": "cd lib && node modules/build notNeeded true",
"eslint": "eslint *.js modules",
"eslint-fix": "eslint *.js modules --fix",
"pretest": "npm run tsc",
"test": "cd lib && node modules/build win64 && node modules/build linux64 && node modules/build macos64"
"test": "cd lib && node modules/build win64 && node modules/build ubuntu64 && node modules/build macos64"
},
"config": {
"forge": {