Fix warn Node24 actions update & Simplify build (#410)

This commit is contained in:
KG7x 2026-03-23 17:10:20 +03:00 committed by GitHub
parent f95b9b7da0
commit c0183bf448
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 85 deletions

View File

@ -21,10 +21,10 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v5 uses: actions/setup-python@v6
with: with:
python-version: "3.12" python-version: "3.12"
cache: "pip" cache: "pip"
@ -42,79 +42,49 @@ jobs:
run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows.exe run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows.exe
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: TgWsProxy name: TgWsProxy
path: | path: dist/TgWsProxy_windows.exe
dist/TgWsProxy_windows.exe
build-win7-64bit: build-win7:
runs-on: windows-latest runs-on: windows-latest
strategy:
matrix:
include:
- arch: x64
suffix: 64bit
- arch: x86
suffix: 32bit
steps: steps:
- name: Checkout - uses: actions/checkout@v6
uses: actions/checkout@v4
- name: Setup Python 3.8 (last version supporting Win7) - uses: actions/setup-python@v6
uses: actions/setup-python@v5
with: with:
python-version: "3.8" python-version: "3.8"
architecture: "x64" architecture: ${{ matrix.arch }}
cache: "pip" cache: "pip"
- name: Install dependencies & pyinstaller
run: pip install . "pyinstaller==5.13.2"
- name: Install dependencies (Win7-compatible) - name: Build EXE with PyInstaller
run: pip install .
- name: Install pyinstaller
run: pip install "pyinstaller==5.13.2"
- name: Build EXE with PyInstaller (Win7)
run: pyinstaller packaging/windows.spec --noconfirm run: pyinstaller packaging/windows.spec --noconfirm
- name: Rename artifact - name: Rename artifact
run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows_7_64bit.exe run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows_7_${{ matrix.suffix }}.exe
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: TgWsProxy-win7-64bit name: TgWsProxy-win7-${{ matrix.suffix }}
path: dist/TgWsProxy_windows_7_64bit.exe path: dist/TgWsProxy_windows_7_${{ matrix.suffix }}.exe
build-win7-32bit:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python 3.8 32-bit (Win7 x86)
uses: actions/setup-python@v5
with:
python-version: "3.8"
architecture: "x86"
cache: "pip"
- name: Install dependencies (Win7 x86)
run: pip install .
- name: Install PyInstaller (Win7 x86)
run: pip install "pyinstaller==5.13.2"
- name: Build EXE with PyInstaller (Win7 32-bit)
run: pyinstaller packaging/windows.spec --noconfirm
- name: Rename artifact
run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows_7_32bit.exe
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: TgWsProxy-win7-32bit
path: dist/TgWsProxy_windows_7_32bit.exe
build-macos: build-macos:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
- name: Install universal2 Python - name: Install universal2 Python
run: | run: |
@ -249,7 +219,7 @@ jobs:
rm -rf "$DMG_TEMP" rm -rf "$DMG_TEMP"
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: TgWsProxy-macOS name: TgWsProxy-macOS
path: dist/TgWsProxy_macos_universal.dmg path: dist/TgWsProxy_macos_universal.dmg
@ -258,7 +228,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
- name: Install system dependencies - name: Install system dependencies
run: | run: |
@ -341,7 +311,7 @@ jobs:
"dist/TgWsProxy_linux_amd64.deb" "dist/TgWsProxy_linux_amd64.deb"
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: TgWsProxy-linux name: TgWsProxy-linux
path: | path: |
@ -349,39 +319,15 @@ jobs:
dist/TgWsProxy_linux_amd64.deb dist/TgWsProxy_linux_amd64.deb
release: release:
needs: [build, build-win7-64bit, build-win7-32bit, build-macos, build-linux] needs: [build, build-win7, build-macos, build-linux]
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event.inputs.make_release == 'true' }} if: ${{ github.event.inputs.make_release == 'true' }}
steps: steps:
- name: Download main build - uses: actions/download-artifact@v4
uses: actions/download-artifact@v4
with: with:
name: TgWsProxy pattern: TgWsProxy*
path: dist
- name: Download Win7 (64bit) build
uses: actions/download-artifact@v4
with:
name: TgWsProxy-win7-64bit
path: dist
- name: Download Win7 (32bit) build
uses: actions/download-artifact@v4
with:
name: TgWsProxy-win7-32bit
path: dist
- name: Download macOS build
uses: actions/download-artifact@v4
with:
name: TgWsProxy-macOS
path: dist
- name: Download Linux build
uses: actions/download-artifact@v4
with:
name: TgWsProxy-linux
path: dist path: dist
merge-multiple: true
- name: Create GitHub Release - name: Create GitHub Release
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2