Skip to content

Commit

Permalink
Update to Qt6 and OpenSSL 3
Browse files Browse the repository at this point in the history
  • Loading branch information
psieg committed Feb 10, 2024
1 parent f929f39 commit 2dc6ed2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: pacman Build (Arch Linux)
steps:
- name: Checkout Source
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build
working-directory: Software/dist_linux
run: ./build-in-docker.sh pacman archlinux latest
Expand All @@ -25,7 +25,7 @@ jobs:
echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
- name: Upload Package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PKG_NAME }}
path: ${{ env.PKG_PATH }}
Expand All @@ -35,7 +35,7 @@ jobs:
name: Flatpack Build
steps:
- name: Checkout Source
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Flatpak
run: |
set -xe
Expand All @@ -52,7 +52,7 @@ jobs:
echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
- name: Upload Package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PKG_NAME }}
path: ${{ env.PKG_PATH }}
Expand All @@ -65,7 +65,7 @@ jobs:
name: dpkg Build (${{ matrix.os }})
steps:
- name: Checkout Source
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build
working-directory: Software/dist_linux
run: ./build-in-docker.sh dpkg ${{ matrix.os }}
Expand All @@ -76,7 +76,7 @@ jobs:
echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
echo "PKG_NAME=$(basename $PKG_PATH | sed 's#amd64#${{ matrix.os }}_amd64#; s# ##')" >> $GITHUB_ENV
- name: Upload Package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PKG_NAME }}
path: ${{ env.PKG_PATH }}
Expand All @@ -85,13 +85,13 @@ jobs:
name: Firmware Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- run: sudo apt-get install gcc-avr avr-libc build-essential
- run: ./build_batch.sh
working-directory: ./Firmware
- name: Archive artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: firmware
path: Firmware/hex/*
Expand All @@ -100,7 +100,7 @@ jobs:
name: Windows Build
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
- run: choco install --no-progress openssl
Expand All @@ -110,7 +110,7 @@ jobs:
with:
cache: true
cache-key-prefix: install-qt-action-default
version: 5.*
version: 6.*
- name: Cached Bass
id: cache-bass
uses: actions/cache@v2
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Build
shell: cmd
run: |
set QTDIR=%Qt5_Dir%
set QTDIR=%Qt6_Dir%
call scripts\win32\generate_sln.bat
MSBuild.exe Lightpack.sln /p:Configuration=Release
- name: Prepare Installer
Expand All @@ -164,7 +164,7 @@ jobs:
- name: Build Installer
shell: cmd
run: |
"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script.iss
"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script_qt6.iss
working-directory: ./Software/dist_windows
- name: Check Package
shell: bash
Expand All @@ -175,7 +175,7 @@ jobs:
echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
- name: Upload Package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PKG_NAME }}
path: ${{ env.PKG_PATH }}
Expand All @@ -186,7 +186,7 @@ jobs:
env:
QT_DEST: Qt
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Select Latest Xcode
run: |
set -xe
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
echo "PKG_PATH=$PKG_PATH" >> $GITHUB_ENV
echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
- name: Upload Package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PKG_NAME }}
path: ${{ env.PKG_PATH }}
2 changes: 1 addition & 1 deletion Software/UpdateElevate

0 comments on commit 2dc6ed2

Please sign in to comment.