Skip to content

Commit

Permalink
Merge branch 'upgrade-vite' of github.com:ituob/itu-ob-editor into up…
Browse files Browse the repository at this point in the history
…grade-vite
  • Loading branch information
SmartWolf1220 committed Dec 23, 2024
2 parents 8aa0cff + d0db796 commit 1b6ac03
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 8 deletions.
38 changes: 35 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build/release

on:
pull_request:
push:
tags:
- v*
Expand All @@ -13,8 +14,7 @@ jobs:
# Platforms to build on/for
strategy:
matrix:
# ubuntu-latest,
os: [macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- name: Check out Git repository
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 18.19.0

# - name: Install Snapcraft
# uses: samuelmeuli/action-snapcraft@v1
Expand Down Expand Up @@ -61,3 +61,35 @@ jobs:
# macOS notarization API key
API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
API_KEY_ISSUER_ID: ${{ secrets.APPLE_API_KEY_ISSUER_ID }}

- name: Upload DMG
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'macos')
with:
name: DMG
path: dist/*.dmg
if-no-files-found: error

- name: Upload AppImage
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'ubuntu')
with:
name: AppImage
path: dist/*.AppImage
if-no-files-found: error

- name: Upload .deb
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'ubuntu')
with:
name: DEB
path: dist/*.deb
if-no-files-found: error

- name: Upload .exe
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'windows')
with:
name: EXE
path: dist/*.exe
if-no-files-found: error
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"@blueprintjs/icons": "^3.18.1",
"@blueprintjs/select": "^3.13.3",
"@electron/remote": "^2.1.2",
"@riboseinc/coulomb": "0.9.11",
"@riboseinc/coulomb": "dev",
"@types/react-window": "^1.8.2",
"async-lock": "^1.2.2",
"electron-log": "^4.2.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1296,10 +1296,10 @@
resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==

"@riboseinc/coulomb@0.9.11":
version "0.9.11"
resolved "https://registry.yarnpkg.com/@riboseinc/coulomb/-/coulomb-0.9.11.tgz#40d66e29e0b72287b07d5b8fd4951168e48be9bf"
integrity sha512-IyWS3hou3A8+h54GuslYTQjoXmixh+hRxuLAPLqzNGFmDbHb1Daqi0AaDiydHf5UdX2mGFbNamMIkguqjHCLLw==
"@riboseinc/coulomb@dev":
version "0.9.12"
resolved "https://registry.yarnpkg.com/@riboseinc/coulomb/-/coulomb-0.9.12.tgz#d569a4027c2e40e748592daeeebf187da52182fb"
integrity sha512-dHGKbUDAb1ChMGGzjBKddvCseLsUXPqR6OJAtnCeh/AvyfOXQJADNvSSBr5e5uK8znY1gZ6KfPLLeJN6eAQE9w==
dependencies:
async-lock "^1.2.2"
fs-extra "^9.0.1"
Expand Down

0 comments on commit 1b6ac03

Please sign in to comment.