Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
2a64a38b
Commit
2a64a38b
authored
10 months ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
CI wrap lines
parent
6e7c73f7
No related branches found
No related tags found
1 merge request
!2515
Debian/oldstable docker container for packaging (#942)
Pipeline
#139912
passed
10 months ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+23
-6
23 additions, 6 deletions
.gitlab-ci.yml
with
23 additions
and
6 deletions
.gitlab-ci.yml
+
23
−
6
View file @
2a64a38b
...
...
@@ -120,7 +120,10 @@ mac_x64:
-
env
-
mkdir build
-
cd build
-
cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$QTDIR/lib/cmake;$BREWDIR" -DCMAKE_BUILD_TYPE=Release -DPython3_ROOT_DIR="$PYPLAT" -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DZERO_TOLERANCE=ON
-
>
cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$QTDIR/lib/cmake;$BREWDIR" -DCMAKE_BUILD_TYPE=Release
-DPython3_ROOT_DIR="$PYPLAT" -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON
-DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DZERO_TOLERANCE=ON
-
make -j$NPROC
-
ctest -j3 --output-on-failure
-
python3 var/mac_py_package.py
...
...
@@ -167,9 +170,14 @@ windows:
-
echo "# PythonPath '<$Env:PYTHONPATH>'"
-
echo "# Powershell <$PSHOME>`n PS Profile <$PROFILE>`n PS Command-Path <$PSCOMMANDPATH>"
# Visual Studio path <https://github.com/microsoft/vswhere/wiki/Find-VC>
-
$vsPath = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationpath
-
>
$vsPath = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
-latest -products *
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationpath
-
echo "Microsoft Visual Studio path = '$vsPath'"
-
Import-Module (Get-ChildItem $vsPath -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName
-
>
Import-Module
(Get-ChildItem $vsPath -Recurse -File -Filter Microsoft.VisualStudio.DevShell.dll).FullName
-
Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments '-arch=x64'
-
Set-Item -Path "env:CC" -Value "cl.exe"
-
Set-Item -Path "env:CXX" -Value "cl.exe"
...
...
@@ -183,11 +191,20 @@ windows:
-
pwd
# configure, make, test, pack
-
cmake --version
-
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$QTCMake_DIR;$BOOST_DIR" -DPython3_ROOT_DIR="$PY_PLATFORM_DIR" -DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5" -DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe" -DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe" -B. ..
-
>
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release
-DCMAKE_PREFIX_PATH="$OPT_DIR;$QTCMake_DIR;$BOOST_DIR"
-DPython3_ROOT_DIR="$PY_PLATFORM_DIR"
-DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5"
-DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe"
-DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe"
-B. ..
-
pwd
-
if($CI_PIPELINE_SOURCE -eq "schedule") { cmake --build . --target clean; echo "redundant target purge done" }
-
>
if($CI_PIPELINE_SOURCE -eq "schedule")
{ cmake --build . --target clean; echo "redundant target purge done" }
-
cmake --build . -j20 --config Release
-
|
-
>
$env:PYTHONPATH += "$CI_PROJECT_DIR/build/lib";
$env:PATH = "$QT_MSVC_DIR/bin;$env:PATH";
ctest -C Release --parallel 20 --output-on-failure
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment