From 5bfd253d14184b2d69c80899a4c6eebb033c002f Mon Sep 17 00:00:00 2001 From: andycall Date: Wed, 10 Aug 2022 20:41:00 +0800 Subject: [PATCH 1/4] fix: fix linux build --- .github/workflows/npm-publish.yml | 22 ++++++++++++++-------- README.md | 13 ++++++------- app/linux/CMakeLists.txt | 4 ++-- build_linux.sh | 5 +++-- package.json | 2 +- platforms/cli-linux/package.json | 4 ++-- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 8d07247..7f4baca 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -11,7 +11,7 @@ on: env: nodeVersion: "16" cmakeVersion: "3.22.x" - flutterVersion: "2.8.1" + flutterVersion: "3.0.5" jobs: build_macos: @@ -30,11 +30,14 @@ jobs: - run: flutter config --enable-macos-desktop - run: flutter doctor -v - name: Npm install - run: npm install --ignore-scripts - - name: Build Cli Vendor App + run: npm install + - name: Build Cli Vendor Appc run: sh build_macos.sh - - name: Upload Cli Vendor App - run: OSS_AK=${{ secrets.ALIYUN_OSS_AK }} OSS_SK=${{ secrets.ALIYUN_OSS_SK }} node scripts/upload.js + - name: Upload Platform package + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + package: ./platforms/cli-macos - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} @@ -58,11 +61,14 @@ jobs: - run: flutter config --enable-linux-desktop - run: flutter doctor -v - name: Npm install - run: npm install --ignore-scripts + run: npm install - name: Build Cli Vendor App run: bash build_linux.sh - - name: Upload Cli Vendor App - run: OSS_AK=${{ secrets.ALIYUN_OSS_AK }} OSS_SK=${{ secrets.ALIYUN_OSS_SK }} node scripts/upload.js + - name: Upload Platform package + - uses: JS-DevTools/npm-publish@v1 + with: + token: ${{ secrets.NPM_TOKEN }} + package: ./platforms/cli-linux - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} diff --git a/README.md b/README.md index 0000ee1..f83800a 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ You can install webf CLI with npm (you may need to use sudo on Linux or macOS): ``` -npm config set foreground-scripts true // Make sure webf binaries can be downloade via install scripts. -npm install -g @openkraken/cli +npm install -g @openwebf/cli ``` Plaform support: @@ -18,9 +17,9 @@ Plaform support: **webf run** ```sh -Usage: kraken run [options] [bundle|url] +Usage: webf run [options] [bundle|url] -Start a kraken app. +Start a webf app. Options: -b --bundle Bundle path. One of bundle or url is needed, if both determined, bundle path will be used. @@ -28,16 +27,16 @@ Options: -i --instruct instruct file path. -s, --source Source code. pass source directory from command line -m --runtime-mode Runtime mode, debug | release. (default: "debug") - --enable-kraken-js-log print kraken js to dart log (default: false) + --enable-webf-js-log print webf js to dart log (default: false) --show-performance-monitor show render performance monitor (default: false) -d, --debug-layout debug element's paint layout (default: false) -h, --help output usage information ``` -**kraken qjsc** +**webf qjsc** ``` -Usage: kraken qjsc [options] [destination] +Usage: webf qjsc [options] [destination] convert javascript code to quickjs bytecode. diff --git a/app/linux/CMakeLists.txt b/app/linux/CMakeLists.txt index f4ebd7b..9deeddf 100644 --- a/app/linux/CMakeLists.txt +++ b/app/linux/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) -set(BINARY_NAME "kraken_example") -set(APPLICATION_ID "com.example.kraken") +set(BINARY_NAME "webf_example") +set(APPLICATION_ID "com.example.webf") cmake_policy(SET CMP0063 NEW) diff --git a/build_linux.sh b/build_linux.sh index 18f2876..2ec5823 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -13,8 +13,9 @@ build_release() { flutter build linux --release ARCH=$(arch) if [[ "$ARCH" == "x86_64" ]]; then - mkdir -p $ROOT/build/linux/release/ - mv $ROOT/app/build/linux/x64/release/bundle $ROOT/platforms/cli-linux/app + cd $ROOT/app/build/linux/x64/release + tar -zcvf ./app.tar.gz ./bundle + mv $ROOT/app/build/linux/x64/release/app.tar.gz $ROOT/platforms/cli-linux/app.tar.gz else echo "Only x86_64 support from now on, maybe someone can add more archs." exit 1 diff --git a/package.json b/package.json index 75869a7..1493386 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "lib" ], "optionalDependencies": { - "@openwebf/cli-linux": "^0.12.0", + "@openwebf/cli-linux": "^0.12.1", "@openwebf/cli-macos": "^0.12.4" }, "author": "Kraken Team", diff --git a/platforms/cli-linux/package.json b/platforms/cli-linux/package.json index 65a9a30..f00ae47 100644 --- a/platforms/cli-linux/package.json +++ b/platforms/cli-linux/package.json @@ -1,6 +1,6 @@ { "name": "@openwebf/cli-linux", - "version": "0.12.0", + "version": "0.12.1", "description": "Command Line Tools for WebF", "engines": { "node": ">=10" @@ -12,7 +12,7 @@ "x64" ], "files": [ - "app" + "app.tar.gz" ], "author": "openwebf team", "license": "MIT" From b874d8daee4c2df6147bf34dd9baf469ecef2544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=A4=A9=E6=88=90?= Date: Wed, 10 Aug 2022 20:43:09 +0800 Subject: [PATCH 2/4] Update npm-publish.yml --- .github/workflows/npm-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 7f4baca..261b57a 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -33,7 +33,6 @@ jobs: run: npm install - name: Build Cli Vendor Appc run: sh build_macos.sh - - name: Upload Platform package - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} @@ -64,7 +63,6 @@ jobs: run: npm install - name: Build Cli Vendor App run: bash build_linux.sh - - name: Upload Platform package - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} From 3ddd5b45c91de6758454591c13e688d8f8130c4e Mon Sep 17 00:00:00 2001 From: andycall Date: Wed, 10 Aug 2022 21:13:08 +0800 Subject: [PATCH 3/4] Fix: fix actions --- .github/workflows/npm-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 261b57a..76dae0d 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -36,7 +36,7 @@ jobs: - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} - package: ./platforms/cli-macos + package: ./platforms/cli-macos/package.json - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} @@ -66,7 +66,7 @@ jobs: - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} - package: ./platforms/cli-linux + package: ./platforms/cli-linux/package.json - uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} From 14d58b599b3780edc74c91e9ce70bb0e5f7017ab Mon Sep 17 00:00:00 2001 From: andycall Date: Wed, 10 Aug 2022 21:20:21 +0800 Subject: [PATCH 4/4] fix: fix actions --- .github/workflows/npm-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 76dae0d..3cad059 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -24,7 +24,7 @@ jobs: - uses: jwlawson/actions-setup-cmake@v1.11 with: cmake-version: ${{ env.cmakeVersion }} - - uses: subosito/flutter-action@v1 + - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.flutterVersion }} - run: flutter config --enable-macos-desktop @@ -52,7 +52,7 @@ jobs: - uses: jwlawson/actions-setup-cmake@v1.11 with: cmake-version: ${{ env.cmakeVersion }} - - uses: subosito/flutter-action@v1 + - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.flutterVersion }} - name: Install gtk