浏览代码

Merge branch 'dev' of ssh://github.com/IceWhaleTech/CasaOS into dev

link 3 年之前
父节点
当前提交
aad2646cf2
共有 3 个文件被更改,包括 10 次插入8 次删除
  1. 4 4
      .github/workflows/casa.yml
  2. 4 4
      README.md
  3. 2 0
      types/system.go

+ 4 - 4
.github/workflows/casa.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
       matrix:
         go_version:
         go_version:
           - 1.17.1
           - 1.17.1
-    runs-on: Ubuntu 20.04
+    runs-on: ubuntu-latest
     steps:
     steps:
 
 
       #      - name: Get release
       #      - name: Get release
@@ -63,7 +63,7 @@ jobs:
       #          git clone $REPO_URL -b $REPO_BRANCH --recursive casa
       #          git clone $REPO_URL -b $REPO_BRANCH --recursive casa
       #          ln -sf /workdir/casa $GITHUB_WORKSPACE/casa
       #          ln -sf /workdir/casa $GITHUB_WORKSPACE/casa
       #          ls
       #          ls
-
+      
 
 
       - name: Set enviroment for github-release
       - name: Set enviroment for github-release
         run: |
         run: |
@@ -76,7 +76,7 @@ jobs:
         uses: actions/setup-node@v2
         uses: actions/setup-node@v2
         with:
         with:
           node-version: '14'
           node-version: '14'
-
+          
       - name: Build frontend with nodejs and yarn
       - name: Build frontend with nodejs and yarn
         run: |
         run: |
           cd UI
           cd UI
@@ -90,7 +90,7 @@ jobs:
       - name: Build with xgo
       - name: Build with xgo
         uses: crazy-max/ghaction-xgo@v1
         uses: crazy-max/ghaction-xgo@v1
         with:
         with:
-          xgo_version: latest
+          xgo_version: v0.7.5
           go_version: ${{ matrix.go_version }}
           go_version: ${{ matrix.go_version }}
           dest: build
           dest: build
           prefix: casa
           prefix: casa

+ 4 - 4
README.md

@@ -6,7 +6,7 @@
 [![Pull Requests](https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/pulls)
 [![Pull Requests](https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/pulls)
 [![Issues](https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/issues)
 [![Issues](https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&logo=github&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/stargazers)
 [![GitHub Stars](https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&logo=github&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/stargazers)
-[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/Gx4BCEtHjx)
+[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/knqAbbBbeX)
 
 
 CasaOS is an open-source Home Cloud system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant Home Cloud system.
 CasaOS is an open-source Home Cloud system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant Home Cloud system.
 
 
@@ -19,7 +19,7 @@ IceWhale team believes that through community-driven collaborative innovation an
 
 
 > ⚠️ Note: 
 > ⚠️ Note: 
 > 
 > 
-> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
+> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/knqAbbBbeX)!
 
 
 ### Quick Setup CasaOS
 ### Quick Setup CasaOS
 
 
@@ -71,9 +71,9 @@ After looking at many systems and software on the market, the team found no serv
 
 
 So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you.
 So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you.
 
 
-> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
+> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/knqAbbBbeX)!
 
 
-[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/Gx4BCEtHjx)
+[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/knqAbbBbeX)
 
 
 
 
 
 

+ 2 - 0
types/system.go

@@ -1,4 +1,6 @@
 package types
 package types
 
 
 const CURRENTVERSION = "0.2.5"
 const CURRENTVERSION = "0.2.5"
+
 const BODY = "<li>Storage Manager</li><li>File synchronization issues</li><li>Fix the app store classification problem</li>"
 const BODY = "<li>Storage Manager</li><li>File synchronization issues</li><li>Fix the app store classification problem</li>"
+