Skip to content

Commit

Permalink
fix: ci (#133)
Browse files Browse the repository at this point in the history
修正构建win版本的ci脚本
  • Loading branch information
msojocs authored Nov 7, 2024
1 parent 5164669 commit 5ac6c86
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 28 deletions.
37 changes: 11 additions & 26 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
needs:
- build-app
runs-on: ubuntu-20.04

container: scottyhardy/docker-wine
strategy:
matrix:
node-version: [16.x]
Expand All @@ -253,33 +253,16 @@ jobs:
name: bilibili-app.src
path: tmp/src

- uses: actions/setup-node@v4
with:
node-version: 20
- name: Prepare
run: |
set -x -u -o pipefail
source /etc/os-release
# Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts
# (see issue https://github.com/actions/virtual-environments/issues/4589)
# In detail we:
# 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, e.g. everything PHP
# 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version
# 3. Assert that no packages from ppa:ondrej/php are left installed
dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | grep '^php' \
| xargs -r -t sudo apt-get remove --yes libpcre2-posix3 libzip4
dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \
| xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V
! dpkg -l | grep '^ii' | grep -F deb.sury.org
sudo apt update
sudo apt install -y wine64
sudo dpkg --add-architecture i386
dpkg --print-foreign-architectures
sudo apt update
sudo apt install libwine
echo "install wine32..."
sudo apt install wine32
sudo npm install asar -g
set -x
echo $SHELL
cat /etc/issue
apt update
npm install asar -g
npm install
echo "$UID"
Expand All @@ -303,6 +286,8 @@ jobs:
BUILD_ARCH: ${{ matrix.ARCH }}
run: |
ls -l
# from @Xarth-Mai
sudo chown -R $(whoami) /github/home
mkdir -p tmp/build
tools/build-prepare.sh
asar e app/app.asar app/app
Expand Down
2 changes: 1 addition & 1 deletion conf/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"extensions",
"app/app-update.yml"
],
"electronVersion": "21.3.3",
"electronVersion": "33.0.2",
"appId": "com.bilibili.app",
"mac": {
"target": [
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
"@grpc/grpc-js": "^1.10.9",
"@grpc/proto-loader": "^0.7.13",
"protobufjs": "^7.3.2"
}
},
"packageManager": "pnpm@8.12.1+sha1.aa961ffce9b6eaa56307d9b5ff7e984f25b7eb58"
}

0 comments on commit 5ac6c86

Please sign in to comment.