Dummy version bump for test build with static

psieg · Feb 10, 2024 · a007621 · a007621
1 parent 02dc426
commit a007621
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 158 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,101 +9,14 @@ defaults:
   run:
     working-directory: ./Software
 jobs:
-  build-pacman:
-    runs-on: ubuntu-20.04
-    name: pacman Build (Arch Linux)
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Build
-        working-directory: Software/dist_linux
-        run: ./build-in-docker.sh pacman archlinux latest
-      - name: Check Package
-        run: |
-          set -xe
-          PKG_PATH=$(ls dist_linux/pacman/prismatik*.pkg.tar*)
-          echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
-          echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
-      - name: Upload Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.PKG_NAME }}
-          path: ${{ env.PKG_PATH }}
-
-  build-flatpack:
-    runs-on: ubuntu-20.04
-    name: Flatpack Build
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Install Flatpak
-        run: |
-          set -xe
-          sudo apt update
-          sudo apt install flatpak flatpak-builder
-          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-      - name: Build
-        working-directory: Software/dist_linux
-        run: ./build-natively.sh flatpak
-      - name: Check Package
-        run: |
-          set -xe
-          PKG_PATH=$(ls dist_linux/flatpak/prismatik*.flatpak)
-          echo "PKG_PATH=Software/$PKG_PATH" >> $GITHUB_ENV
-          echo "PKG_NAME=$(basename $PKG_PATH)" >> $GITHUB_ENV
-      - name: Upload Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.PKG_NAME }}
-          path: ${{ env.PKG_PATH }}
-
-  build-dpkg:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        os: [ 'ubuntu 22.04', 'ubuntu 20.04', 'ubuntu 18.04', 'debian 11.5' ]
-    name: dpkg Build (${{ matrix.os }})
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v4
-      - name: Build
-        working-directory: Software/dist_linux
-        run: ./build-in-docker.sh dpkg ${{ matrix.os }}
-      - name: Check Package
-        run: |
-          set -xe
-          PKG_PATH=$(ls dist_linux/dpkg/prismatik*.deb)
-          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@v4
-        with:
-          name: ${{ env.PKG_NAME }}
-          path: ${{ env.PKG_PATH }}
-
-  build-fw:
-    name: Firmware Build
-    runs-on: ubuntu-latest
-    steps:
-      - 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@v4
-        with:
-          name: firmware
-          path: Firmware/hex/*
-
   build-win:
     name: Windows Build
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: choco install --no-progress openssl
+#      - run: choco install --no-progress openssl
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
@@ -181,69 +94,3 @@ jobs:
           name: ${{ env.PKG_NAME }}
           path: ${{ env.PKG_PATH }}
 
-  build-macos:
-    name: macOS Build
-    runs-on: macOS-11
-    env:
-      QT_DEST: Qt
-    steps:
-      - uses: actions/checkout@v4
-      - name: Select Latest Xcode
-        run: |
-          set -xe
-          sw_vers
-          ls -d /Applications/Xcode*.app
-          LAST_XCODE=$(ls -d /Applications/Xcode*.app | grep -v beta | sort -Vr | head -n1)
-          sudo xcode-select --switch $LAST_XCODE
-          xcode-select -p
-          xcodebuild -version
-          xcodebuild -showsdks
-      - name: install Qt installer
-        run: |
-          set -xe
-          pip3 install -U pip
-          pip3 install aqtinstall
-          pip3 show aqtinstall
-          aqt list-qt mac desktop
-          QT_VERSION=$(aqt list-qt mac desktop --spec 6.2 --latest-version)
-          echo "QT_VERSION=$QT_VERSION" >> $GITHUB_ENV
-      - name: Cached Qt
-        id: cache-qt
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.QT_DEST }}
-          key: ${{ runner.os }}-qt-${{ env.QT_VERSION }}
-      - name: install Qt
-        # The cache is relative to the workspace (not the default working dir)
-        # so the QT installation should be too.
-        working-directory: ./
-        run: |
-          set -xe
-          QTDIR=$PWD/$QT_DEST/$QT_VERSION/macos
-          echo "QTDIR=$QTDIR" >> $GITHUB_ENV
-          if [[ -d "$QTDIR" ]]
-          then
-            echo using cached version
-          else
-            echo installing fresh version
-            aqt install-qt mac desktop $QT_VERSION clang_64 --modules qtserialport --outputdir $QT_DEST
-          fi
-      - name: Build
-        run: |
-          export PATH=$QTDIR/bin:$PATH
-          qmake -r
-          make
-          macdeployqt bin/Prismatik.app -dmg
-      - name: Check Package
-        run: |
-          set -xe
-          VERSION=`cat RELEASE_VERSION`
-          PKG_PATH="Software/bin/Prismatik.dmg"
-          PKG_NAME="Prismatik_${VERSION}.dmg"
-          echo "PKG_PATH=$PKG_PATH" >> $GITHUB_ENV
-          echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
-      - name: Upload Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.PKG_NAME }}
-          path: ${{ env.PKG_PATH }}
diff --git a/Software/RELEASE_VERSION b/Software/RELEASE_VERSION
@@ -1 +1 @@
-5.11.2.31
+5.11.2.30
diff --git a/Software/dist_windows/script_qt6.iss b/Software/dist_windows/script_qt6.iss
@@ -66,7 +66,7 @@ Source: "content/prismatik-unhook32.dll"; DestDir: "{app}"; MinVersion: 6.1.7600
 Source: "content/UpdateElevate.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "content/platforms/*"; DestDir: "{app}\platforms"; Flags: ignoreversion
 Source: "content/styles/*"; DestDir: "{app}\styles"; Flags: ignoreversion
-Source: "content/tls/qschannelbackend.dll"; DestDir: "{app}\styles"; Flags: ignoreversion
+Source: "content/tls/qschannelbackend.dll"; DestDir: "{app}\tls"; Flags: ignoreversion
 Source: "content/Plugins/*"; DestDir: "{#UserSettingsDirName}\Plugins"; Flags: onlyifdoesntexist createallsubdirs recursesubdirs
 ; These are needed only when including the bass library for sound visualization
 Source: "content/bass.dll"; DestDir: "{app}"; Flags: ignoreversion

diff --git a/Software/scripts/win32/prepare_installer.sh b/Software/scripts/win32/prepare_installer.sh
@@ -20,3 +20,4 @@ cp bin/*.exe dist_windows/content/
 
 cp -r bin/platforms dist_windows/content/
 cp -r bin/styles dist_windows/content/
+cp -r bin/tls dist_windows/content/
diff --git a/Software/src/version.h b/Software/src/version.h
@@ -27,10 +27,10 @@
 #pragma once
 
 // Current version of Lightpack software
-#define VERSION_STR "5.11.2.31"
+#define VERSION_STR "5.11.2.30"
 
 // Resource defines using in Lightpack.rc
-#define VER_FILEVERSION				5,11,2,31
+#define VER_FILEVERSION				5,11,2,30
 #define VER_PRODUCTVERSION			VER_FILEVERSION
 
 #define VER_FILEVERSION_STR			VERSION_STR "\0"