From 85f309c445be6c1b14f5807772fa23edbf1b3c32 Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:16:09 +0800 Subject: [PATCH 1/7] fix: pkg ci --- .github/workflows/pkg.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index f750d2f..8e43158 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -21,6 +21,7 @@ jobs: runs-on: ubuntu-latest needs: setup steps: + - uses: actions/checkout@v3 - run: rm -rf build - run: yarn dist:production_mac @@ -31,6 +32,7 @@ jobs: contents: read packages: write steps: + - uses: actions/checkout@v3 - run: echo "::set-env name=PACKAGE_VERSION::$(node -p "require('./package.json').version")" - name: Upload mac pkg uses: actions/upload-artifact@v3.1.3 From f65f6757e1a0f0ad0271a1243af5e562c6f3a6fa Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:26:30 +0800 Subject: [PATCH 2/7] Update modify_package.sh --- scripts/modify_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/modify_package.sh b/scripts/modify_package.sh index f0b561f..6da46b7 100755 --- a/scripts/modify_package.sh +++ b/scripts/modify_package.sh @@ -7,11 +7,11 @@ else fi -if [[ "$OSTYPE" == "darwin"* ]]; then +if [ "$OSTYPE" == "darwin"* ]; then # 修改架构 sed -i "" "s/\"arch\"\:.*\".*\"/\"arch\"\: \"$1\"/" ./package.json # 修改包名 sed -i "" "s/\"artifactName\"\:.*\".*\"/\"artifactName\"\: \"$name\"/" ./package.json else sed -i "s/\"arch\"\:.*\".*\"/\"arch\"\: \"$1\"/" ./package.json -fi \ No newline at end of file +fi From e8f7c6a709bd6dd822fd1e90c1015a8533bf3113 Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:33:38 +0800 Subject: [PATCH 3/7] Update pkg.yml --- .github/workflows/pkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 8e43158..6a1c43a 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -15,13 +15,13 @@ jobs: with: node-version: 16 - run: npm install -g yarn - - run: yarn install build-mac: runs-on: ubuntu-latest needs: setup steps: - uses: actions/checkout@v3 + - run: yarn install - run: rm -rf build - run: yarn dist:production_mac From 66dd18e7d69b324620a212ac8d349275b5c0464a Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:40:42 +0800 Subject: [PATCH 4/7] Update pkg.yml --- .github/workflows/pkg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 6a1c43a..b801b3a 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -13,8 +13,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 16 - - run: npm install -g yarn + node-version: 16.15.0 + - run: npm install -g yarn@1.22.19 build-mac: runs-on: ubuntu-latest From cf66fc9518f1c5b2f51ca504525141890cb1f305 Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:46:36 +0800 Subject: [PATCH 5/7] Update pkg.yml --- .github/workflows/pkg.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index b801b3a..b8b2e12 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -20,6 +20,9 @@ jobs: runs-on: ubuntu-latest needs: setup steps: + - uses: actions/setup-node@v3 + with: + node-version: 16.15.0 - uses: actions/checkout@v3 - run: yarn install - run: rm -rf build From dc7f2fb642c4509539c75975aa620bf564a7585c Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 15:59:56 +0800 Subject: [PATCH 6/7] Update package.json --- package.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package.json b/package.json index 983c58a..9c7e014 100644 --- a/package.json +++ b/package.json @@ -45,15 +45,6 @@ "directories": { "output": "build" }, - "publish": [ - { - "provider": "s3", - "region": "cn-northwest-1", - "bucket": "vika-client-download", - "endpoint": "https://s3.cn-northwest-1.amazonaws.com.cn", - "path": "/integration" - } - ], "win": { "icon": "public/icon_win.png", "target": [ From 6edc6a5817007aa9a974818ace9eb2bed670604a Mon Sep 17 00:00:00 2001 From: Kilian Date: Thu, 14 Sep 2023 16:06:36 +0800 Subject: [PATCH 7/7] Update pkg.yml --- .github/workflows/pkg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index b8b2e12..70a972c 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -27,6 +27,7 @@ jobs: - run: yarn install - run: rm -rf build - run: yarn dist:production_mac + continue-on-error: true upload-mac: runs-on: ubuntu-latest