Compare commits

..

No commits in common. "main" and "0.2.8" have entirely different histories.
main ... 0.2.8

3 changed files with 6 additions and 70 deletions

View File

@ -18,9 +18,6 @@ on:
commit:
type: string
default: main
release:
type: boolean
default: false
permissions:
contents: write
@ -35,22 +32,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
with:
ref: ${{ inputs.commit || github.sha }}
# 关键修改:补充编译依赖
- name: Install system dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y \
npm \
wine32 \
build-essential \
python3 \
libxi-dev \
libgl1-mesa-dev \
libpng-dev
sudo apt-get install npm wine32
- name: Install pnpm
uses: pnpm/action-setup@v2
@ -61,7 +48,7 @@ jobs:
run: |
git submodule update --init --recursive
cd um-react
pnpm install --no-frozen-lockfile
pnpm install --frozen-lockfile
cd ..
npm install --frozen-lockfile
@ -98,11 +85,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1
# macOS 补充依赖
- name: Install system dependencies
run: |
brew install node
brew install pkg-config cairo pango libpng jpeg giflib
run: brew install node
- name: Install pnpm
uses: pnpm/action-setup@v2
@ -113,7 +97,7 @@ jobs:
run: |
git submodule update --init --recursive
cd um-react
pnpm install --no-frozen-lockfile
pnpm install --frozen-lockfile
cd ..
npm install --frozen-lockfile
@ -151,6 +135,6 @@ jobs:
file: ${{ needs.build-linux-windows.outputs.version }}/*
tag: ${{ needs.build-linux-windows.outputs.version }}
body: Release ${{ needs.build-linux-windows.outputs.version }}
target_commit: ${{ inputs.commit || github.sha }}
target_commit: ${{ github.event_name == 'repository_dispatch' && inputs.commit || github.sha }}
overwrite: true
file_glob: true

View File

@ -1,48 +0,0 @@
name: Update um-react manual
on:
workflow_dispatch:
inputs:
commit:
description: 'Commit to fetch'
type: string
required: true
release:
description: 'Create a release for this update'
type: boolean
required: false
default: false
permissions:
contents: write
jobs:
update-um-react:
name: Update um-react
runs-on: ubuntu-latest
outputs:
commit: ${{ steps.push.outputs.pushed && steps.push.outputs.commit-sha || github.sha }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
- name: Update repo
run: |
git submodule update --init
cd um-react
git checkout ${{ inputs.commit }}
cd ..
- name: Push
id: push
uses: actions4git/add-commit-push@v1
continue-on-error: true
with:
commit-message: Update um-react to ${{ inputs.commit }}
call-build:
uses: ./.github/workflows/build-electron.yml
needs: update-um-react
with:
commit: ${{ needs.update-um-react.outputs.commit }}
release: ${{ inputs.release }}

@ -1 +1 @@
Subproject commit d91e2fffe4747da635d4d82579205a0e8a8a298e
Subproject commit c1e17992e9a9f07d4806a5cb023a8317f332d396