Skip to content

Commit

Permalink
Merge pull request #599 from Hi-Windom/huge_merge
Browse files Browse the repository at this point in the history
Huge merge
  • Loading branch information
Soltus authored Mar 26, 2024
2 parents 22e92ab + a19ba26 commit 0491729
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 40 deletions.
30 changes: 0 additions & 30 deletions .github/README_Sillot_Docker.md

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ jobs:
docker buildx build --push --platform linux/amd64 -t soltus/sillot:latest -t soltus/sillot:${{ github.event.inputs.image_tag }}-sillot .

- name: Update Docker Hub Description
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_PWD }}
repository: soltus/sillot
readme-filepath: ./README_Sillot_Docker.md
repository: soltus/sillot # 这是 docker hub 的不是 github 的
readme-filepath: ./.github/README.md
short-description: ${{ github.event.repository.description }}
enable-url-completion: true
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"xboxyan.tree-generator",
"unifiedjs.vscode-mdx",
"astro-build.astro-vscode",
"golang.go"
"golang.go",
"github.vscode-github-actions"
],
"unwantedRecommendations": []
}
7 changes: 1 addition & 6 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sillot",
"version": "0.27.25",
"version": "0.27.26",
"syv": "3.0.5",
"sypv": "3.0.4",
"description": "Build Your Eternal Digital Garden",
Expand Down Expand Up @@ -57,11 +57,6 @@
"note-taking",
"notebook"
],
"author": {
"name": "Yunnan Liandi Technology Co., Ltd.",
"email": "845765@qq.com",
"url": "https://ld246.com"
},
"maintainers": [
{
"name": "Liang Ding",
Expand Down

0 comments on commit 0491729

Please sign in to comment.