Skip to content

Commit

Permalink
feat: modify release tagname
Browse files Browse the repository at this point in the history
  • Loading branch information
fishros committed Apr 1, 2024
1 parent d33158a commit 344df12
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 20 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ jobs:
run: |
file_list=$(ls -1 dist/*) # Only list .bin files in the bin directory
echo "FILES=$file_list" >> $GITHUB_ENV
echo "REF_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
# Create a release and upload release assets
- name: Create Release and Upload Release Asset
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.ref }}
name: FishBot配置助手 ${{ github.ref }}
name: ${{ env.REF_NAME }}
body: Linux版本及Docker版本配置助手。
draft: false
prerelease: false
Expand Down
23 changes: 4 additions & 19 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
FROM ubuntu:22.04

RUN apt update && apt install python3 python3-pip -y
RUN apt update && apt install python3 python3-pip libglib2.0-dev -y

RUN pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \
&& pip3 install esptool pyserial pyqt6 requests
# RUN apt install cmake libboost-dev libboost-dev libgtest-dev libboost-thread-dev libboost-python-dev libpython3-dev -y
&& pip3 install esptool pyserial pyqt6 requests pyinstaller

# WORKDIR /fishbot

# RUN apt install language-pack-zh-hans fonts-noto-cjk -y \
# && locale-gen zh_CN.UTF-8
RUN pip3 install pyinstaller libglib2.0-dev
# RUN apt-get install ffmpeg libsm6 libxext6 -y
# RUN apt install libegl1 -y
# RUN apt install libxcb-xinerama0 libxcb-xinerama0-dev -y
# RUN apt install libxcb-util1 -y
# RUN apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev -y
# RUN apt install wget -y
ENV LANG zh_CN.UTF-8
# COPY fishbot_tool /fishbot_tool/fishbot_tool
# ENV PYTHONPATH /fishbot_tool
# WORKDIR /fishbot_tool/fishbot_tool

ENTRYPOINT []

# docker build -t fishros2/fishbot-tool .
# docker build -t fishros2/fishbot_tool:build_ubuntu22 -f Dockerfile.build .
# docker push fishros2/fishbot_tool:build_ubuntu22
# docker run -it --rm --privileged -v /dev:/dev -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY fishros2/fishbot-tool python main.py


0 comments on commit 344df12

Please sign in to comment.