Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	theme.yaml
This commit is contained in:
j m 2024-07-30 05:33:59 +08:00
commit c7202c3539
4 changed files with 3 additions and 74 deletions

2
.github/FUNDING.yml vendored
View File

@ -1,3 +1,3 @@
# These are supported funding model platforms # These are supported funding model platforms
custom: ["https://afdian.net/a/org-zsjy"] custom: ["https://ifdian.net/a/org-zsjy"]

View File

@ -80,5 +80,5 @@ jobs:
with: with:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/halo-theme-dream2.0-plus.zip asset_path: ./dist/halo-theme-dream2.0-plus.zip
asset_name: halo-theme-dream2.0-plus.zip asset_name: halo-theme-dream2.0-plus-V${{ env.version }}.zip
asset_content_type: application/zip asset_content_type: application/zip

View File

@ -1,71 +0,0 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
name: Gitea halo-theme-dream2.0-plus CI
on:
push:
branches: [ "master", "dev" ]
paths: ["theme.yaml"]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
# 迁出代码
- uses: actions/checkout@v4
# 确定构建分支类型
- name: Determine Branch Type
id: determine_branch_type
run: |
branch_type=unknown
if [[ $GITHUB_REF == refs/heads/master ]]; then
branch_type=master
elif [[ $GITHUB_REF == refs/heads/dev ]]; then
branch_type=dev
fi
echo "branch_type=$branch_type" >> $GITHUB_ENV
shell: bash
# 确定构建版本
- name: version
id: version
run: |
version=$(grep 'version:' theme.yaml | sed 's/.*:\s*//')
echo "version=$version" >> $GITHUB_ENV
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v4
# with:
# node-version: ${{ matrix.node-version }}
# cache: 'npm'
# - name: Install dependencies
# run: npm install
# # Actions构建
# - name: Build
# run: npm run actions --tag=${{ env.version }}
# # 上传构建产物zip
# - name: Upload artifacts
# uses: actions/upload-artifact@v3
# with:
# name: halo-theme-dream2.0-plus
# path: dist-actions
# 如果是master分支创建latest的Release否则创建 预览版
- name: Create Release
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.version }}
release_name: ${{ env.version }}
body: ${{ github.event.commits[0].message }}
draft: false
prerelease: ${{ env.branch_type != 'master' }}

View File

@ -5,7 +5,7 @@
<a href="https://github.com/zsjy/halo-theme-dream2.0-plus/blob/master/LICENSE"><img alt="license" src="https://img.shields.io/github/license/zsjy/halo-theme-dream2.0-plus?style=flat-square"/></a> <a href="https://github.com/zsjy/halo-theme-dream2.0-plus/blob/master/LICENSE"><img alt="license" src="https://img.shields.io/github/license/zsjy/halo-theme-dream2.0-plus?style=flat-square"/></a>
<a href="https://github.com/zsjy/halo-theme-dream2.0-plus/releases"><img alt="downloads" src="https://img.shields.io/github/downloads/zsjy/halo-theme-dream2.0-plus/total.svg?style=flat-square"/></a> <a href="https://github.com/zsjy/halo-theme-dream2.0-plus/releases"><img alt="downloads" src="https://img.shields.io/github/downloads/zsjy/halo-theme-dream2.0-plus/total.svg?style=flat-square"/></a>
<a href="https://github.com/zsjy/halo-theme-dream2.0-plus/commits"><img alt="commits" src="https://img.shields.io/github/last-commit/zsjy/halo-theme-dream2.0-plus.svg?style=flat-square"/></a> <a href="https://github.com/zsjy/halo-theme-dream2.0-plus/commits"><img alt="commits" src="https://img.shields.io/github/last-commit/zsjy/halo-theme-dream2.0-plus.svg?style=flat-square"/></a>
<a href="https://afdian.net/a/org-zsjy"><img alt="donate" src="https://img.shields.io/badge/$-donate-ff69b4.svg?style=flat-square"/></a> <a href="https://ifdian.net/a/org-zsjy"><img alt="donate" src="https://img.shields.io/badge/$-donate-ff69b4.svg?style=flat-square"/></a>
</p> </p>
本仓库为 `Halo 2.x` 主题仓库。 本仓库为 `Halo 2.x` 主题仓库。