aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/dco.yml2
-rw-r--r--.github/workflows/build.yml94
-rw-r--r--.github/workflows/trigger_builds.yml2
-rw-r--r--.github/workflows/trigger_release.yml5
-rw-r--r--.github/workflows/winget.yml14
5 files changed, 92 insertions, 25 deletions
diff --git a/.github/dco.yml b/.github/dco.yml
new file mode 100644
index 00000000..7993b95c
--- /dev/null
+++ b/.github/dco.yml
@@ -0,0 +1,2 @@
+allowRemediationCommits:
+ individual: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e52af4e..bc92f37f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,10 @@ on:
description: Type of build (Debug, Release, RelWithDebInfo, MinSizeRel)
type: string
default: Debug
+ secrets:
+ SPARKLE_ED25519_KEY:
+ description: Private key for signing Sparkle updates
+ required: false
jobs:
build:
@@ -16,20 +20,31 @@ jobs:
include:
- os: ubuntu-20.04
+ qt_ver: 5
- os: ubuntu-20.04
appimage: true
+ qt_ver: 6
+ qt_host: linux
+ qt_version: '6.3.1'
+ qt_modules: 'qt5compat qtimageformats'
- os: windows-2022
- name: "Windows-i686"
+ name: "Windows-Legacy"
msystem: mingw32
+ qt_ver: 5
- os: windows-2022
- name: "Windows-x86_64"
- msystem: mingw64
+ name: "Windows"
+ msystem: mingw32
+ qt_ver: 6
- os: macos-12
- macosx_deployment_target: 10.13
+ macosx_deployment_target: 10.14
+ qt_ver: 6
+ qt_host: mac
+ qt_version: '6.3.1'
+ qt_modules: 'qt5compat qtimageformats'
runs-on: ${{ matrix.os }}
@@ -63,9 +78,13 @@ jobs:
cmake:p
extra-cmake-modules:p
ninja:p
- qt5:p
+ qt${{ matrix.qt_ver }}-base:p
+ qt${{ matrix.qt_ver }}-svg:p
+ qt${{ matrix.qt_ver }}-imageformats:p
+ quazip-qt${{ matrix.qt_ver }}:p
ccache:p
nsis:p
+ ${{ matrix.qt_ver == 6 && 'qt6-5compat:p' || '' }}
- name: Setup ccache
if: runner.os != 'Windows' && inputs.build_type == 'Debug'
@@ -94,9 +113,9 @@ jobs:
uses: actions/cache@v3.0.2
with:
path: '${{ github.workspace }}\.ccache'
- key: ${{ matrix.os }}-${{ matrix.msystem }}
+ key: ${{ matrix.os }}--qt${{ matrix.qt_ver }}
restore-keys: |
- ${{ matrix.os }}-${{ matrix.msystem }}
+ ${{ matrix.os }}--qt${{ matrix.qt_ver }}
- name: Set short version
shell: bash
@@ -104,25 +123,32 @@ jobs:
ver_short=`git rev-parse --short HEAD`
echo "VERSION=$ver_short" >> $GITHUB_ENV
- - name: Install Qt (macOS)
- if: runner.os == 'macOS'
+ - name: Install Dependencies (Linux)
+ if: runner.os == 'Linux'
run: |
- brew update
- brew install qt@5 ninja extra-cmake-modules
+ sudo apt-get -y update
+ sudo apt-get -y install ninja-build extra-cmake-modules scdoc
- - name: Update Qt (AppImage)
- if: runner.os == 'Linux' && matrix.appimage == true
+ - name: Install Dependencies (macOS)
+ if: runner.os == 'macOS'
run: |
- sudo add-apt-repository ppa:savoury1/qt-5-15
- sudo add-apt-repository ppa:savoury1/kde-5-80
- sudo add-apt-repository ppa:savoury1/gpg
- sudo add-apt-repository ppa:savoury1/ffmpeg4
+ brew update
+ brew install ninja extra-cmake-modules
- name: Install Qt (Linux)
- if: runner.os == 'Linux'
+ if: runner.os == 'Linux' && matrix.appimage != true
run: |
- sudo apt-get -y update
- sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 ninja-build qt5-image-formats-plugins extra-cmake-modules
+ sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5
+
+ - name: Install Qt (macOS and AppImage)
+ if: matrix.qt_ver == 6 && runner.os != 'Windows'
+ uses: jurplel/install-qt-action@v2
+ with:
+ version: ${{ matrix.qt_version }}
+ host: ${{ matrix.qt_host }}
+ target: 'desktop'
+ modules: ${{ matrix.qt_modules }}
+ aqtversion: ==2.1.*
- name: Prepare AppImage (Linux)
if: runner.os == 'Linux' && matrix.appimage == true
@@ -140,18 +166,18 @@ jobs:
- name: Configure CMake (macOS)
if: runner.os == 'macOS'
run: |
- cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DQt5_DIR=/usr/local/opt/qt@5 -DCMAKE_PREFIX_PATH=/usr/local/opt/qt@5 -DLauncher_BUILD_PLATFORM=macOS -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -G Ninja
+ cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DLauncher_BUILD_PLATFORM=macOS -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
- name: Configure CMake (Windows)
if: runner.os == 'Windows'
shell: msys2 {0}
run: |
- cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -G Ninja
+ cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
- name: Configure CMake (Linux)
if: runner.os == 'Linux'
run: |
- cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -G Ninja
+ cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CCACHE_VAR }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -G Ninja
##
# BUILD
@@ -197,6 +223,25 @@ jobs:
sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "PolyMC.app/Contents/MacOS/polymc"
tar -czf ../PolyMC.tar.gz *
+ - name: Make Sparkle signature (macOS)
+ if: runner.os == 'macOS'
+ run: |
+ if [ '${{ secrets.SPARKLE_ED25519_KEY }}' != '' ]; then
+ brew install openssl@3
+ echo '${{ secrets.SPARKLE_ED25519_KEY }}' > ed25519-priv.pem
+ signature=$(/usr/local/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/PolyMC.tar.gz -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
+ rm ed25519-priv.pem
+ cat >> $GITHUB_STEP_SUMMARY << EOF
+ ### Artifact Information :information_source:
+ - :memo: Sparkle Signature (ed25519): \`$signature\`
+ EOF
+ else
+ cat >> $GITHUB_STEP_SUMMARY << EOF
+ ### Artifact Information :information_source:
+ - :warning: Sparkle Signature (ed25519): No private key available (likely a pull request or fork)
+ EOF
+ fi
+
- name: Package (Windows)
if: runner.os == 'Windows'
shell: msys2 {0}
@@ -252,11 +297,14 @@ jobs:
chmod +x linuxdeploy-*.AppImage
mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-{8,17}-openjdk
+ mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
cp -r ${{ github.workspace }}/JREs/jre8/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk
cp -r ${{ github.workspace }}/JREs/jre17/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-17-openjdk
+ cp -r /home/runner/work/PolyMC/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
+
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk/lib/amd64/server"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk/lib/amd64"
diff --git a/.github/workflows/trigger_builds.yml b/.github/workflows/trigger_builds.yml
index 3ec6bb95..ee9eb4ea 100644
--- a/.github/workflows/trigger_builds.yml
+++ b/.github/workflows/trigger_builds.yml
@@ -28,3 +28,5 @@ jobs:
uses: ./.github/workflows/build.yml
with:
build_type: Debug
+ secrets:
+ SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index 91cd0474..2dbd5cd4 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -42,10 +42,11 @@ jobs:
for d in PolyMC-Windows-*; do
cd "${d}" || continue
- ARCH="$(echo -n ${d} | cut -d '-' -f 3)"
+ LEGACY="$(echo -n ${d} | grep -o Legacy || true)"
INST="$(echo -n ${d} | grep -o Setup || true)"
PORT="$(echo -n ${d} | grep -o Portable || true)"
- NAME="PolyMC-Windows-${ARCH}"
+ NAME="PolyMC-Windows"
+ test -z "${LEGACY}" || NAME="${NAME}-Legacy"
test -z "${PORT}" || NAME="${NAME}-Portable"
test -z "${INST}" || mv PolyMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
new file mode 100644
index 00000000..b8ecce13
--- /dev/null
+++ b/.github/workflows/winget.yml
@@ -0,0 +1,14 @@
+name: Publish to WinGet
+on:
+ release:
+ types: [released]
+
+jobs:
+ publish:
+ runs-on: windows-latest
+ steps:
+ - uses: vedantmgoyal2009/winget-releaser@latest
+ with:
+ identifier: PolyMC.PolyMC
+ installers-regex: '\.exe$'
+ token: ${{ secrets.WINGET_TOKEN }}
generated by cgit (git 2.46.0) at 2025-02-19 06:13:43 +0000