From 9d7518ea699a14b8a9af4f1c4cf92f6d9ddcc726 Mon Sep 17 00:00:00 2001 From: Guillaume Robin <70137982+GuillaumeRobinSoriano@users.noreply.github.com> Date: Sat, 3 Jun 2023 18:30:08 +0900 Subject: [PATCH] Revert "Fix error of building" --- .github/workflows/build.yml | 36 +++++++++++++++++++++++++++++++---- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- package.json | 1 - 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 962c1a7..a772708 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - fix-gh-build-action tags-ignore: - '**' pull_request: @@ -15,7 +14,7 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - uses: actions/setup-node@master with: node-version: 16 @@ -23,7 +22,36 @@ jobs: run: | sudo apt-get update -y sudo apt-get install -y --no-install-recommends software-properties-common - + + sudo dpkg --add-architecture i386 + + curl -L https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_20.04/Release.key > winehq.key + sudo apt-key add winehq.key + + sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_20.04/ ./' + sudo apt-get update -y + + sudo apt-get -y purge software-properties-common libdbus-glib-1-2 python3-dbus python3-gi python3-pycurl python3-software-properties + + sudo apt-get install aptitude + sudo aptitude install -y libglib2.0-0:i386 + sudo aptitude install -y libgphoto2-6:i386 + sudo aptitude install -y libgstreamer-plugins-base1.0-0:i386 + sudo aptitude install -y libgstreamer1.0-0:i386 + sudo aptitude install -y libsane:i386 + sudo aptitude install -y libodbc1:i386 + + sudo rm -rvf /var/lib/apt/lists/* + sudo apt-get install -f + sudo apt-get update + sudo apt-get upgrade + sudo apt-get dist-upgrade + + sudo apt-get install -y wine-stable-i386 + + sudo apt-get install -y --no-install-recommends winehq-stable + + wine --version sudo apt-get install -y fakeroot - name: Install mono run: | @@ -32,6 +60,6 @@ jobs: - name: install dependencies run: yarn install - name: build - run: yarn run dist-linux + run: yarn run dist env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c208233..e4c4e2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - uses: actions/setup-node@master with: node-version: 16 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2c2593c..9e1f542 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v2 - uses: actions/setup-node@master with: node-version: 16 diff --git a/package.json b/package.json index 149c368..2e2c8eb 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "front-dev": "concurrently \"ELECTRON_IS_DEV=1 yarn react-start\" \"wait-on http://localhost:3000 && ELECTRON_IS_DEV=1 yarn electron-start\"", "pack": "electron-builder --dir", "dist": "electron-builder build -wl", - "dist-linux": "electron-builder build -l", "build-dist": "yarn build && electron-builder --windows --linux --publish=always", "start": "electron-forge start", "package": "electron-forge package",