diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 515a420..747f930 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,14 +82,14 @@ jobs: ls -l - name: Upload artifact - uses: actions/upload-artifact@v2.3.1 + uses: actions/upload-artifact@v3 with: # Artifact name name: wechat-devtools-${{ matrix.ARCH }}.src path: tmp/src - name: Upload artifact - uses: actions/upload-artifact@v2.3.1 + uses: actions/upload-artifact@v3 with: # Artifact name name: wechat-devtools-${{ matrix.ARCH }}.build @@ -110,7 +110,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Prepare run: | @@ -145,7 +145,7 @@ jobs: ls -l - name: Upload artifact - uses: actions/upload-artifact@v2.3.1 + uses: actions/upload-artifact@v3 with: # Artifact name name: wechat-devtools-${{ matrix.ARCH }}.build @@ -165,7 +165,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Generate TAG id: Tag @@ -203,7 +203,7 @@ jobs: env WINE=false tools/build-deepin.sh ${{ steps.tag.outputs.tag }} - name: Upload artifact - uses: actions/upload-artifact@v2.3.1 + uses: actions/upload-artifact@v3 with: # Artifact name name: wechat-devtools-${{ matrix.ARCH }}.build @@ -219,7 +219,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Inspect directory after downloading artifacts run: ls -alFR diff --git a/changelog.md b/changelog.md index 4d9a45c..560fd1e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 1.06.2405020-4 / 2024-09-28 + +- fix: 视频无法播放的问题(#118) + # 1.06.2405020-3 / 2024-08-10 - update: compiler(Linux) v0.1.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index d594a5e..4e86fbc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,6 +4,7 @@ WORKDIR /workspace RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ + sed -i 's/security.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ mkdir -p /build_temp/python36 /build_temp/nodejs && \ apt update && \ @@ -27,7 +28,7 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ ./setup_16.x &&\ apt-get install -y nodejs &&\ rm -rf /build_temp && \ - apt install -y gosu && \ + apt install -y gosu unzip python && \ gosu nobody true && \ useradd -s /bin/bash -m user diff --git a/readme.md b/readme.md index 7de25d1..e21f05b 100644 --- a/readme.md +++ b/readme.md @@ -163,6 +163,8 @@ | 赞赏人 | 赞赏 | 时间 | |-------|---------|-----| +| [shao4598](https://github.com/shao4598) | 50.00¥ | 2024-09-24 | +| [OWALabuy](https://github.com/OWALabuy) | 16.66¥ | 2024-08-28 | | [wangvation](https://github.com/wangvation) | 50.00¥ | 2024-07-16 | | 孤泉冷月 | 100.00¥ | 2024-07-12 | | [liushuai05](https://github.com/liushuai05) | 88.00¥ | 2023-12-26 | diff --git a/test/nw-simple/index.html b/test/nw-simple/index.html new file mode 100644 index 0000000..606b8aa --- /dev/null +++ b/test/nw-simple/index.html @@ -0,0 +1,9 @@ + +
+ + \ No newline at end of file diff --git a/test/nw-simple/package.json b/test/nw-simple/package.json new file mode 100644 index 0000000..63ea05f --- /dev/null +++ b/test/nw-simple/package.json @@ -0,0 +1,4 @@ +{ + "name": "test", + "main": "index.html" +} \ No newline at end of file diff --git a/tools/build-with-docker.sh b/tools/build-with-docker.sh index 96e054d..0cf320a 100755 --- a/tools/build-with-docker.sh +++ b/tools/build-with-docker.sh @@ -2,5 +2,5 @@ root_dir=$(cd `dirname $0`/.. && pwd -P) echo "$(id -u):$(id -g)" -docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v3 \ +docker run -u "$(id -u):$(id -g)" --rm -i -e "ACTION_MODE=${ACTION_MODE:-false}" -w /workspace -v "$root_dir:/workspace" jiyecafe/wechat-devtools-build:v1.0.4 \ bash ./docker/entrypoint \ No newline at end of file diff --git a/tools/fix-other.sh b/tools/fix-other.sh index da9f9d6..1ed4784 100755 --- a/tools/fix-other.sh +++ b/tools/fix-other.sh @@ -3,6 +3,7 @@ set -ex root_dir=$(cd `dirname $0`/.. && pwd -P) srcdir=$root_dir tmp_dir="$root_dir/tmp" +nwjs_dir="$root_dir/nwjs" package_dir="$root_dir/package.nw" # 修复: webview manager @@ -55,6 +56,14 @@ cd "${package_dir}/node_modules/wcc/build/Release" && rm -rf wcsc.node && mv wcs # 修复mock按钮无反应 sed -i '1s/^/window.prompt = parent.prompt;\n/' "${package_dir}/js/ideplugin/devtools/index.js" +# 修复视频无法播放 +if [ ! -f "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip" ];then + wget -c https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download/0.55.0/0.55.0-linux-x64.zip -O "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip.tmp" + mv "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip.tmp" "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip" +fi +rm -rf "${nwjs_dir}/lib/libffmpeg.so" +unzip "${srcdir}/cache/libffmpeg-0.55.00-linux-x64.zip" -d "${nwjs_dir}/lib" + current=`date "+%Y-%m-%d %H:%M:%S"` timeStamp=`date -d "$current" +%s` echo $timeStamp > "${package_dir}/.build_time" diff --git a/tools/push-docker.sh b/tools/push-docker.sh old mode 100644 new mode 100755 index 176c0d6..eb671f4 --- a/tools/push-docker.sh +++ b/tools/push-docker.sh @@ -1,6 +1,9 @@ #!/bin/bash root_dir=$(cd `dirname $0`/.. && pwd -P) +set -ex + cd $root_dir/docker -docker build . --name jiyecafe/wechat-devtools-build:latest -# docker tag wechat-web-devtools-linux_wechat_devtools jiyecafe/wechat-devtools-build:latest +docker build . -t jiyecafe/wechat-devtools-build:v1.0.4 +docker tag jiyecafe/wechat-devtools-build:v1.0.4 jiyecafe/wechat-devtools-build:latest +docker push jiyecafe/wechat-devtools-build:v1.0.4 docker push jiyecafe/wechat-devtools-build:latest \ No newline at end of file