fz-mirrors/AstrBot
1
0
Fork 0
mirror of https://github.com/AstrBotDevs/AstrBot synced 2026-07-15 17:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/dev' into dev

Browse Source 
Resolved merge conflicts in:
- func_tool_manager.py: kept origin version (full implementation)
- astr_main_agent*.py: kept HEAD version (complete refactor)
- cron_tools.py: kept HEAD version (with get_all_tools)
- config/default.py: kept HEAD version (DEFAULT_WEB_SEARCH_PROVIDER)
- dashboard/*.vue: kept HEAD version
- web_searcher engines: kept HEAD version
- Added new tools: knowledge_base_tools, message_tools, registry, web_search_tools
This commit is contained in:
LIghtJUNction
2026-04-08 19:45:16 +08:00
parent 7d22cfbf73 38b1b4d4ea
commit 43156d6eac
45 changed files with 2430 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/docker-image.yml vendored
View File

@@ -70,14 +70,14 @@ jobs:
uses: docker/setup-buildx-action@v4.0.0
- name: Log in to DockerHub
uses: docker/login-action@v4.0.0
uses: docker/login-action@v4.1.0
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Login to GitHub Container Registry
if: env.HAS_GHCR_TOKEN == 'true'
uses: docker/login-action@v4.0.0
uses: docker/login-action@v4.1.0
with:
registry: ghcr.io
username: ${{ env.GHCR_OWNER }}
@@ -169,14 +169,14 @@ jobs:
uses: docker/setup-buildx-action@v4.0.0
- name: Log in to DockerHub
uses: docker/login-action@v4.0.0
uses: docker/login-action@v4.1.0
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Login to GitHub Container Registry
if: env.HAS_GHCR_TOKEN == 'true'
uses: docker/login-action@v4.0.0
uses: docker/login-action@v4.1.0
with:
registry: ghcr.io
username: ${{ env.GHCR_OWNER }}