Revert formatting .gitlab-ci.yml

pull/3229/head
uramer 2 years ago
parent 2cf6c5b3ce
commit 7a7fd128aa

@ -28,8 +28,8 @@ variables:
extends: .Ubuntu_Image extends: .Ubuntu_Image
cache: cache:
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
stage: build stage: build
variables: variables:
CMAKE_EXE_LINKER_FLAGS: -fuse-ld=mold CMAKE_EXE_LINKER_FLAGS: -fuse-ld=mold
@ -74,8 +74,8 @@ Coverity:
cache: cache:
key: Coverity.ubuntu_20.04.v1 key: Coverity.ubuntu_20.04.v1
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
variables: variables:
CCACHE_SIZE: 2G CCACHE_SIZE: 2G
CC: clang-11 CC: clang-11
@ -119,7 +119,7 @@ Ubuntu_GCC:
CCACHE_SIZE: 4G CCACHE_SIZE: 4G
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks. # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
timeout: 2h timeout: 2h
Clang_Format: Clang_Format:
extends: .Ubuntu_Image extends: .Ubuntu_Image
stage: checks stage: checks
@ -389,9 +389,9 @@ Ubuntu_Clang_integration_tests:
- $CI_PROJECT_ID == "7107382" - $CI_PROJECT_ID == "7107382"
cache: cache:
paths: paths:
- ccache/ - ccache/
script: script:
- rm -fr build # remove the build directory - rm -fr build # remove the build directory
- CI/before_install.osx.sh - CI/before_install.osx.sh
- export CCACHE_BASEDIR="$(pwd)" - export CCACHE_BASEDIR="$(pwd)"
- export CCACHE_DIR="$(pwd)/ccache" - export CCACHE_DIR="$(pwd)/ccache"
@ -420,29 +420,29 @@ macOS12_Xcode13:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
before_script: before_script:
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1 - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
- choco source disable -n=chocolatey - choco source disable -n=chocolatey
- choco install git --force --params "/GitAndUnixToolsOnPath" -y - choco install git --force --params "/GitAndUnixToolsOnPath" -y
- choco install 7zip -y - choco install 7zip -y
- choco install ccache -y - choco install ccache -y
- choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
- choco install vswhere -y - choco install vswhere -y
- choco install ninja -y - choco install ninja -y
- choco install python -y - choco install python -y
- refreshenv - refreshenv
- | - |
function Make-SafeFileName { function Make-SafeFileName {
param( param(
[Parameter(Mandatory=$true)] [Parameter(Mandatory=$true)]
[String] [String]
$FileName $FileName
) )
[IO.Path]::GetInvalidFileNameChars() | ForEach-Object { [IO.Path]::GetInvalidFileNameChars() | ForEach-Object {
$FileName = $FileName.Replace($_, '_') $FileName = $FileName.Replace($_, '_')
}
return $FileName
} }
return $FileName
}
stage: build stage: build
script: script:
- $time = (Get-Date -Format "HH:mm:ss") - $time = (Get-Date -Format "HH:mm:ss")
@ -471,22 +471,22 @@ macOS12_Xcode13:
cache: cache:
key: ninja-v5 key: ninja-v5
paths: paths:
- ccache - ccache
- deps - deps
- MSVC2019_64_Ninja/deps/Qt - MSVC2019_64_Ninja/deps/Qt
artifacts: artifacts:
when: always when: always
paths: paths:
- "*.zip" - "*.zip"
- "*.log" - "*.log"
- MSVC2019_64_Ninja/*.log - MSVC2019_64_Ninja/*.log
- MSVC2019_64_Ninja/*/*.log - MSVC2019_64_Ninja/*/*.log
- MSVC2019_64_Ninja/*/*/*.log - MSVC2019_64_Ninja/*/*/*.log
- MSVC2019_64_Ninja/*/*/*/*.log - MSVC2019_64_Ninja/*/*/*/*.log
- MSVC2019_64_Ninja/*/*/*/*/*.log - MSVC2019_64_Ninja/*/*/*/*/*.log
- MSVC2019_64_Ninja/*/*/*/*/*/*.log - MSVC2019_64_Ninja/*/*/*/*/*/*.log
- MSVC2019_64_Ninja/*/*/*/*/*/*/*.log - MSVC2019_64_Ninja/*/*/*/*/*/*/*.log
- MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log - MSVC2019_64_Ninja/*/*/*/*/*/*/*/*.log
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks. # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
timeout: 2h timeout: 2h
@ -523,28 +523,28 @@ macOS12_Xcode13:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
before_script: before_script:
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1 - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
- choco source disable -n=chocolatey - choco source disable -n=chocolatey
- choco install git --force --params "/GitAndUnixToolsOnPath" -y - choco install git --force --params "/GitAndUnixToolsOnPath" -y
- choco install 7zip -y - choco install 7zip -y
- choco install ccache -y - choco install ccache -y
- choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
- choco install vswhere -y - choco install vswhere -y
- choco install python -y - choco install python -y
- refreshenv - refreshenv
- | - |
function Make-SafeFileName { function Make-SafeFileName {
param( param(
[Parameter(Mandatory=$true)] [Parameter(Mandatory=$true)]
[String] [String]
$FileName $FileName
) )
[IO.Path]::GetInvalidFileNameChars() | ForEach-Object { [IO.Path]::GetInvalidFileNameChars() | ForEach-Object {
$FileName = $FileName.Replace($_, '_') $FileName = $FileName.Replace($_, '_')
}
return $FileName
} }
return $FileName
}
stage: build stage: build
script: script:
- $time = (Get-Date -Format "HH:mm:ss") - $time = (Get-Date -Format "HH:mm:ss")
@ -572,22 +572,22 @@ macOS12_Xcode13:
cache: cache:
key: msbuild-v5 key: msbuild-v5
paths: paths:
- ccache - ccache
- deps - deps
- MSVC2019_64/deps/Qt - MSVC2019_64/deps/Qt
artifacts: artifacts:
when: always when: always
paths: paths:
- "*.zip" - "*.zip"
- "*.log" - "*.log"
- MSVC2019_64/*.log - MSVC2019_64/*.log
- MSVC2019_64/*/*.log - MSVC2019_64/*/*.log
- MSVC2019_64/*/*/*.log - MSVC2019_64/*/*/*.log
- MSVC2019_64/*/*/*/*.log - MSVC2019_64/*/*/*/*.log
- MSVC2019_64/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*.log
- MSVC2019_64/*/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*/*.log
- MSVC2019_64/*/*/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*/*/*.log
- MSVC2019_64/*/*/*/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*/*/*/*.log
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks. # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
timeout: 2h timeout: 2h
@ -621,6 +621,7 @@ Windows_MSBuild_RelWithDebInfo:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
.Ubuntu_AndroidNDK_arm64-v8a: .Ubuntu_AndroidNDK_arm64-v8a:
tags: tags:
- linux - linux
@ -681,21 +682,21 @@ Windows_MSBuild_RelWithDebInfo:
- scripts/find_missing_merge_requests.py --project_id=$CI_PROJECT_ID --ignored_mrs_path=$CI_PROJECT_DIR/.resubmitted_merge_requests.txt - scripts/find_missing_merge_requests.py --project_id=$CI_PROJECT_ID --ignored_mrs_path=$CI_PROJECT_DIR/.resubmitted_merge_requests.txt
.flatpak: .flatpak:
image: "docker.io/bilelmoussaoui/flatpak-github-actions" image: 'docker.io/bilelmoussaoui/flatpak-github-actions'
stage: build stage: build
script: script:
- flatpak install -y flathub org.kde.Platform/x86_64/5.15-21.08 - flatpak install -y flathub org.kde.Platform/x86_64/5.15-21.08
- flatpak install -y flathub org.kde.Sdk/x86_64/5.15-21.08 - flatpak install -y flathub org.kde.Sdk/x86_64/5.15-21.08
- flatpak-builder --ccache --force-clean --repo=repo build CI/org.openmw.OpenMW.devel.yaml - flatpak-builder --ccache --force-clean --repo=repo build CI/org.openmw.OpenMW.devel.yaml
- flatpak build-bundle ./repo openmw.flatpak org.openmw.OpenMW.devel - flatpak build-bundle ./repo openmw.flatpak org.openmw.OpenMW.devel
cache: cache:
key: flatpak key: flatpak
paths: paths:
- ".flatpak-builder" - ".flatpak-builder"
artifacts: artifacts:
untracked: false untracked: false
paths: paths:
- "openmw.flatpak" - "openmw.flatpak"
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks. # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
# Flatpak Builds compile all dependencies aswell so need more time. Build results of libraries are cached # Flatpak Builds compile all dependencies aswell so need more time. Build results of libraries are cached
timeout: 4h timeout: 4h

Loading…
Cancel
Save