Skip to content

Commit 18fc221

Browse files
authored
Revert "Revert "Fix error of building" (#32)" (#33)
This reverts commit e5aa333.
1 parent e5aa333 commit 18fc221

File tree

4 files changed

+7
-34
lines changed

4 files changed

+7
-34
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- fix-gh-build-action
78
tags-ignore:
89
- '**'
910
pull_request:
@@ -14,44 +15,15 @@ jobs:
1415
build:
1516
runs-on: ubuntu-20.04
1617
steps:
17-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1819
- uses: actions/setup-node@master
1920
with:
2021
node-version: 16
2122
- name: Install windows dependencies
2223
run: |
2324
sudo apt-get update -y
2425
sudo apt-get install -y --no-install-recommends software-properties-common
25-
26-
sudo dpkg --add-architecture i386
27-
28-
curl -L https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_20.04/Release.key > winehq.key
29-
sudo apt-key add winehq.key
30-
31-
sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_20.04/ ./'
32-
sudo apt-get update -y
33-
34-
sudo apt-get -y purge software-properties-common libdbus-glib-1-2 python3-dbus python3-gi python3-pycurl python3-software-properties
35-
36-
sudo apt-get install aptitude
37-
sudo aptitude install -y libglib2.0-0:i386
38-
sudo aptitude install -y libgphoto2-6:i386
39-
sudo aptitude install -y libgstreamer-plugins-base1.0-0:i386
40-
sudo aptitude install -y libgstreamer1.0-0:i386
41-
sudo aptitude install -y libsane:i386
42-
sudo aptitude install -y libodbc1:i386
43-
44-
sudo rm -rvf /var/lib/apt/lists/*
45-
sudo apt-get install -f
46-
sudo apt-get update
47-
sudo apt-get upgrade
48-
sudo apt-get dist-upgrade
49-
50-
sudo apt-get install -y wine-stable-i386
51-
52-
sudo apt-get install -y --no-install-recommends winehq-stable
53-
54-
wine --version
26+
5527
sudo apt-get install -y fakeroot
5628
- name: Install mono
5729
run: |
@@ -60,6 +32,6 @@ jobs:
6032
- name: install dependencies
6133
run: yarn install
6234
- name: build
63-
run: yarn run dist
35+
run: yarn run dist-linux
6436
env:
6537
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
publish:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- uses: actions/setup-node@master
1717
with:
1818
node-version: 16

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v3
1111
- uses: actions/setup-node@master
1212
with:
1313
node-version: 16

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"front-dev": "concurrently \"ELECTRON_IS_DEV=1 yarn react-start\" \"wait-on http://localhost:3000 && ELECTRON_IS_DEV=1 yarn electron-start\"",
6161
"pack": "electron-builder --dir",
6262
"dist": "electron-builder build -wl",
63+
"dist-linux": "electron-builder build -l",
6364
"build-dist": "yarn build && electron-builder --windows --linux --publish=always",
6465
"start": "electron-forge start",
6566
"package": "electron-forge package",

0 commit comments

Comments
 (0)