mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-23 03:02:30 +01:00
Change build args to have double -
Split builds into regular and official git tag release builds
This commit is contained in:
parent
799f4978be
commit
ebff53948c
@ -5,7 +5,11 @@ include:
|
|||||||
- ".gitlab/ci/check_jobs.yml"
|
- ".gitlab/ci/check_jobs.yml"
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
|
# Regular build for every commit
|
||||||
- build
|
- build
|
||||||
|
# Git release tag builds
|
||||||
|
- release_build
|
||||||
|
# Checks for source code formattings
|
||||||
- check
|
- check
|
||||||
|
|
||||||
documentation:
|
documentation:
|
||||||
|
@ -3,32 +3,39 @@ standalone_windows:
|
|||||||
extends:
|
extends:
|
||||||
- .base_windows_build
|
- .base_windows_build
|
||||||
script:
|
script:
|
||||||
- python Tools/build.py -type release -use-aqt -installer -deploy-version
|
- python Tools/build.py --type=release --use-aqt -installer --deploy-version
|
||||||
|
|
||||||
standalone_osx:
|
standalone_osx:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .base_osx_build
|
- .base_osx_build
|
||||||
script:
|
script:
|
||||||
- python3 Tools/build.py -type release -use-aqt -deploy-version -sign_osx
|
- python3 Tools/build.py --type=release --use-aqt --deploy-version --sign_osx
|
||||||
|
|
||||||
standalone_linux:
|
standalone_linux:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .base_linux_build
|
- .base_linux_build
|
||||||
script:
|
script:
|
||||||
- python3 Tools/build.py -type release -deploy-version -use-aqt -installer
|
- python3 Tools/build.py --type=release --deploy-version --use-aqt -installer
|
||||||
|
|
||||||
steam_windows:
|
steam_windows:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .base_windows_build
|
- .base_windows_build
|
||||||
script:
|
script:
|
||||||
- python Tools/build.py -type release -steam -use-aqt -deploy-version
|
- python Tools/build.py --type=release -steam --use-aqt --deploy-version
|
||||||
|
|
||||||
steam_osx:
|
steam_osx:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .base_osx_build
|
- .base_osx_build
|
||||||
script:
|
script:
|
||||||
- python3 Tools/build.py -type release -steam -use-aqt -deploy-version -sign_osx
|
- python3 Tools/build.py --type=release -steam --use-aqt --deploy-version --sign_osx
|
||||||
|
|
||||||
|
steam_linux:
|
||||||
|
stage: build
|
||||||
|
extends:
|
||||||
|
- .base_linux_build
|
||||||
|
script:
|
||||||
|
- python3 Tools/build.py --type=release -steam --deploy-version --use-aqt -installer
|
||||||
|
@ -1,26 +1,26 @@
|
|||||||
steam_linux:
|
steam_linux:
|
||||||
stage: build
|
stage: release_build
|
||||||
extends:
|
extends:
|
||||||
- .base_linux_build
|
- .base_linux_build
|
||||||
script:
|
script:
|
||||||
- python3 Tools/build.py -type release -steam -deploy-version -use-aqt -installer --tag $CI_COMMIT_TAG
|
- python3 Tools/build.py --type=release --steam --deploy-version --use-aqt -installer --tag $CI_COMMIT_TAG
|
||||||
rules:
|
rules:
|
||||||
- if: "$CI_COMMIT_TAG"
|
- if: "$CI_COMMIT_TAG"
|
||||||
|
|
||||||
steam_windows:
|
steam_windows:
|
||||||
stage: build
|
stage: release_build
|
||||||
extends:
|
extends:
|
||||||
- .base_windows_build
|
- .base_windows_build
|
||||||
script:
|
script:
|
||||||
- python Tools/build.py -type release -steam -use-aqt -deploy-version --tag $CI_COMMIT_TAG
|
- python Tools/build.py --type=release --steam --use-aqt --deploy-version --tag $CI_COMMIT_TAG
|
||||||
rules:
|
rules:
|
||||||
- if: "$CI_COMMIT_TAG"
|
- if: "$CI_COMMIT_TAG"
|
||||||
|
|
||||||
steam_osx:
|
steam_osx:
|
||||||
stage: build
|
stage: release_build
|
||||||
extends:
|
extends:
|
||||||
- .base_osx_build
|
- .base_osx_build
|
||||||
script:
|
script:
|
||||||
- python3 Tools/build.py -type release -steam -use-aqt -deploy-version -sign_osx --tag $CI_COMMIT_TAG
|
- python3 Tools/build.py --type=release --steam --use-aqt --deploy-version -sign_osx --tag $CI_COMMIT_TAG
|
||||||
rules:
|
rules:
|
||||||
- if: "$CI_COMMIT_TAG"
|
- if: "$CI_COMMIT_TAG"
|
||||||
|
@ -2,7 +2,7 @@ formatting:
|
|||||||
stage: check
|
stage: check
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
image:
|
image:
|
||||||
name: ubuntu:20.04
|
name: ubuntu:23.10
|
||||||
tags:
|
tags:
|
||||||
- gitlab-org-docker
|
- gitlab-org-docker
|
||||||
before_script:
|
before_script:
|
||||||
|
8
.vscode/tasks.json
vendored
8
.vscode/tasks.json
vendored
@ -102,15 +102,15 @@
|
|||||||
"osx": {
|
"osx": {
|
||||||
"args": [
|
"args": [
|
||||||
"build.py",
|
"build.py",
|
||||||
"-type=release",
|
"--type=release",
|
||||||
"-deploy-version",
|
"--deploy-version",
|
||||||
"-steam"
|
"-steam"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"args": [
|
"args": [
|
||||||
"build.py",
|
"build.py",
|
||||||
"-type=release",
|
"--type=release",
|
||||||
"-deploy-version",
|
"--deploy-version",
|
||||||
"-steam"
|
"-steam"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -376,25 +376,25 @@ if __name__ == "__main__":
|
|||||||
parser = argparse.ArgumentParser(
|
parser = argparse.ArgumentParser(
|
||||||
description='Build and Package ScreenPlay')
|
description='Build and Package ScreenPlay')
|
||||||
parser.add_argument('--tag', type=str, help="GitLab CI tag", default="")
|
parser.add_argument('--tag', type=str, help="GitLab CI tag", default="")
|
||||||
parser.add_argument('-qt-version', action="store", dest="qt_version_overwrite",
|
parser.add_argument('--qt-version', action="store", dest="qt_version_overwrite",
|
||||||
help="Overwrites the default Qt version")
|
help="Overwrites the default Qt version")
|
||||||
parser.add_argument('-qt-installer-version', action="store", dest="qt_installer_version_overwrite",
|
parser.add_argument('--qt-installer-version', action="store", dest="qt_installer_version_overwrite",
|
||||||
help="Overwrites the default Qt installer framework version")
|
help="Overwrites the default Qt installer framework version")
|
||||||
parser.add_argument('-type', action="store", dest="build_type", default="release",
|
parser.add_argument('--type', action="store", dest="build_type", default="release",
|
||||||
help="Build type. This is either debug or release.")
|
help="Build type. This is either debug or release.")
|
||||||
parser.add_argument('-use-aqt', action="store_true", dest="use_aqt",
|
parser.add_argument('--use-aqt', action="store_true", dest="use_aqt",
|
||||||
help="Absolute qt path. If not set the default path is used\Windows: C:\Qt\nLinux & macOS:~/Qt/.")
|
help="Absolute qt path. If not set the default path is used\Windows: C:\Qt\nLinux & macOS:~/Qt/.")
|
||||||
parser.add_argument('-steam', action="store_true", dest="build_steam",
|
parser.add_argument('--steam', action="store_true", dest="build_steam",
|
||||||
help="Enable if you want to build the Steam workshop plugin.")
|
help="Enable if you want to build the Steam workshop plugin.")
|
||||||
parser.add_argument('-tests', action="store_true", dest="build_tests",
|
parser.add_argument('--tests', action="store_true", dest="build_tests",
|
||||||
help="Build tests.")
|
help="Build tests.")
|
||||||
parser.add_argument('-installer', action="store_true", dest="create_installer",
|
parser.add_argument('--installer', action="store_true", dest="create_installer",
|
||||||
help="Create a installer.")
|
help="Create a installer.")
|
||||||
parser.add_argument('-sign_osx', action="store_true", dest="sign_osx", default=False,
|
parser.add_argument('--sign_osx', action="store_true", dest="sign_osx", default=False,
|
||||||
help="Signs the executable on macOS. This requires a valid Apple Developer ID set up.")
|
help="Signs the executable on macOS. This requires a valid Apple Developer ID set up.")
|
||||||
parser.add_argument('-deploy-version', action="store_true", dest="build_deploy",
|
parser.add_argument('--deploy-version', action="store_true", dest="build_deploy",
|
||||||
help="Create a deploy version of ScreenPlay for sharing with the world. A not deploy version is for local development only!")
|
help="Create a deploy version of ScreenPlay for sharing with the world. A not deploy version is for local development only!")
|
||||||
parser.add_argument('-architecture', action="store", dest="build_architecture", default="",
|
parser.add_argument('--architecture', action="store", dest="build_architecture", default="",
|
||||||
help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
|
help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user