Skip to content

Commit e5aa333

Browse files
Revert "Fix error of building" (#32)
1 parent 802b82a commit e5aa333

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

.github/workflows/build.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- fix-gh-build-action
87
tags-ignore:
98
- '**'
109
pull_request:
@@ -15,15 +14,44 @@ jobs:
1514
build:
1615
runs-on: ubuntu-20.04
1716
steps:
18-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v2
1918
- uses: actions/setup-node@master
2019
with:
2120
node-version: 16
2221
- name: Install windows dependencies
2322
run: |
2423
sudo apt-get update -y
2524
sudo apt-get install -y --no-install-recommends software-properties-common
26-
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
2755
sudo apt-get install -y fakeroot
2856
- name: Install mono
2957
run: |
@@ -32,6 +60,6 @@ jobs:
3260
- name: install dependencies
3361
run: yarn install
3462
- name: build
35-
run: yarn run dist-linux
63+
run: yarn run dist
3664
env:
3765
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@v3
15+
- uses: actions/checkout@v2
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@v3
10+
uses: actions/checkout@v2
1111
- uses: actions/setup-node@master
1212
with:
1313
node-version: 16

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
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",
6463
"build-dist": "yarn build && electron-builder --windows --linux --publish=always",
6564
"start": "electron-forge start",
6665
"package": "electron-forge package",

0 commit comments

Comments
 (0)