From 1f875ce45da64ed7401fd000bdcb5dd1c225467e Mon Sep 17 00:00:00 2001 From: Denis Freund Date: Fri, 25 Oct 2024 12:24:12 +0200 Subject: [PATCH] chore: fix workflows --- .github/workflows/master.yaml | 13 ++++--------- .github/workflows/release.yaml | 12 +++--------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml index c519b37..04c28e9 100644 --- a/.github/workflows/master.yaml +++ b/.github/workflows/master.yaml @@ -7,7 +7,7 @@ jobs: build: # Prevent running this on forks if: github.repository_owner == 'headwindsim' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: MAIN_PRE_RELEASE_ID: 101378539 MAIN_PRE_RELEASE_TAG: vmain @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.9' + node-version: '20.9' - name: Create .sentrydsn file run: | echo ${{ secrets.SENTRY_DSN_INSTALLER }} >> ./extraResources/.sentrydsn @@ -29,13 +29,8 @@ jobs: run: npm ci - name: Install system requirements - run: | - sudo eatmydata apt-get install ppa-purge - sudo eatmydata ppa-purge -y ppa:ubuntu-toolchain-r/test - - sudo dpkg --add-architecture i386 - sudo apt update - sudo DEBIAN_FRONTEND=noninteractive eatmydata apt install -y --no-install-recommends wine-stable wine32 wine64 + run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 && sudo apt-get install -y wine32 wine64 + - name: Package installer run: | npm run package && rm -rf ./dist/win-unpacked/ diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 59e6dfc..4db0a05 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: # Prevent running this on forks if: github.repository_owner == 'headwindsim' name: Upload Release Asset - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: ASSET_PATH: dist/Headwind_Installer_Setup.exe ASSET_DIRECTORY: dist/ @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '16.9' + node-version: '20.9' - name: Create .sentrydsn file run: | @@ -30,13 +30,7 @@ jobs: run: npm ci - name: Install system requirements - run: | - sudo eatmydata apt-get install ppa-purge - sudo eatmydata ppa-purge -y ppa:ubuntu-toolchain-r/test - - sudo dpkg --add-architecture i386 - sudo apt update - sudo DEBIAN_FRONTEND=noninteractive eatmydata apt install -y --no-install-recommends wine-stable wine32 wine64 + run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 && sudo apt-get install -y wine32 wine64 - name: Package installer run: |