fix release action

typecho · Sep 8, 2021 · 9bd4eae · 9bd4eae
1 parent a31da68
commit 9bd4eae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,6 +4,9 @@ root = true
 indent_style = space
 indent_size = 4
 
+[*.yml]
+indent_size = 2
+
 [*.scss]
 indent_size = 2
 

diff --git a/.github/workflows/Typecho-dev-Ci.yml b/.github/workflows/Typecho-dev-Ci.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Build
       run: |
         mkdir build
-        cp -r LICENSE.txt *.php admin install usr var build/
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
         mkdir build/usr/uploads/
         chmod 777 build/usr/uploads/
         rm -rf build/admin/src

diff --git a/.github/workflows/Typecho-release-Ci.yml b/.github/workflows/Typecho-release-Ci.yml
@@ -11,17 +11,21 @@ jobs:
       uses: actions/checkout@v2
     - name: Build
       run: |
-        cd ./tools/
-        make all
+        mkdir build
+        cp -r LICENSE.txt index.php install.php admin install usr var build/
+        mkdir build/usr/uploads/
+        chmod 777 build/usr/uploads/
+        rm -rf build/admin/src
+        zip -q -r typecho.zip ./build
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
           tag_name: ${{ github.ref }}
-          release_name: Typecho ${{ github.ref }}
-          draft: false
+          release_name: ${{ github.ref }}
+          draft: true
           prerelease: false
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -30,6 +34,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./tools/build.tar.gz
-          asset_name: Typecho-build.tar.gz
-          asset_content_type: application/gzip
+          asset_path: ./typecho.zip
+          asset_name: typecho.zip
+          asset_content_type: application/zip
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
@@ -93,6 +93,7 @@
  * @property bool $feedFullText
  * @property int $defaultCategory
  * @property bool $frontArchive
+ * @property array $plugins
  */
 class Options extends Base
 {