1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00

Remove seperate signing step and put it into the build step

Fix qt path
This commit is contained in:
Elias Steurer 2023-02-11 13:53:44 +01:00
parent 06b7306173
commit 5abaf85b3f
2 changed files with 4 additions and 36 deletions

View File

@ -1,6 +1,5 @@
stages:
- build
- sign
- check
.base_windows_build:
@ -50,9 +49,7 @@ standalone_osx:
tags:
- osx
script:
- python3 Tools/build.py -type release -use-aqt -deploy-version -architecture x64
- python3 Tools/build.py -type release -use-aqt -deploy-version -architecture arm64
- python3 Tools/macos_lipo.py
- python3 Tools/build.py -type release -use-aqt -deploy-version -sign_osx
artifacts:
expire_in: "2 weeks"
paths:
@ -93,37 +90,7 @@ steam_osx:
tags:
- osx
script:
- python3 Tools/build.py -type release -steam -use-aqt -deploy-version -architecture x64
- python3 Tools/build.py -type release -steam -use-aqt -deploy-version -architecture arm64
- python3 Tools/macos_lipo.py
artifacts:
expire_in: "2 weeks"
paths:
- build-universal-osx-release/bin/
sign_osx:
stage: sign
needs: ["standalone_osx"]
only:
- release
tags:
- osx
script:
- python3 Tools/macos_sign.py
artifacts:
expire_in: "2 weeks"
paths:
- build-universal-osx-release/bin/
sign_osx_steam:
stage: sign
needs: ["steam_osx"]
only:
- release
tags:
- osx
script:
- python3 Tools/macos_sign.py
- python3 Tools/build.py -type release -steam -use-aqt -deploy-version -sign_osx
artifacts:
expire_in: "2 weeks"
paths:

View File

@ -3,6 +3,7 @@
import sys
from pathlib import Path
from sys import stdout
import os
stdout.reconfigure(encoding='utf-8')
@ -18,7 +19,7 @@ elif sys.platform == "linux":
QT_PLATFORM = "gcc_64"
SCREENPLAY_VERSION = "0.15.0-RC5"
QT_PATH = Path.cwd().parent.parent.joinpath("aqt")
QT_PATH = path = Path(os.path.join(os.path.realpath(__file__), "../../../aqt")).resolve()
QT_VERSION = "6.5.0"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")