Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
f5b9487c
Verified
Commit
f5b9487c
authored
5 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
More Azure CI updates
parent
e983346e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.ci/azure-build.yml
+10
-6
10 additions, 6 deletions
.ci/azure-build.yml
.ci/install.sh
+7
-0
7 additions, 0 deletions
.ci/install.sh
.ci/script.sh
+1
-0
1 addition, 0 deletions
.ci/script.sh
azure-pipelines.yml
+21
-2
21 additions, 2 deletions
azure-pipelines.yml
with
39 additions
and
8 deletions
.ci/azure-build.yml
+
10
−
6
View file @
f5b9487c
parameters
:
osName
:
'
linux'
steps
:
-
script
:
|
-
bash
:
|
./.ci/install.sh
export PATH=/usr/local/bin:${PATH}
-
bash
:
|
export TRAVIS_OS_NAME=${{ osName }}
export CXX=${CXX_COMPILER}
export CC=${C_COMPILER}
# Use TRAVIS_TAG if defined, or the short commit SHA otherwise
export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)}
-
script
:
|
-
bash
:
|
./.ci/script.sh
sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true
cp ./.ci/bintray-release.json .
-
script
:
|
./.ci/install.sh
export PATH=/usr/local/bin:${PATH}
\ No newline at end of file
cp ./.ci/bintray-release.json .
\ No newline at end of file
This diff is collapsed.
Click to expand it.
.ci/install.sh
+
7
−
0
View file @
f5b9487c
...
...
@@ -37,6 +37,9 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
cd
libsodium-1.0.16/
./configure
&&
make
&&
make check
&&
sudo
make
install
)
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
sudo
apt-key add -
echo
"deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main"
|
sudo tee
/etc/apt/sources.list.d/llvm.list
sudo
add-apt-repository
-y
ppa:beineri/opt-qt
${
QT_VERSION
}
-trusty
# needed for git-lfs, otherwise the follow apt update fails.
sudo
apt-key adv
--keyserver
hkp://keyserver.ubuntu.com:80
--recv-keys
6B05F25D762E3157
...
...
@@ -44,8 +47,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
# needed for mongodb repository: https://github.com/travis-ci/travis-ci/issues/9037
sudo
apt-key adv
--keyserver
hkp://keyserver.ubuntu.com:80
--recv
0C49F3730359A14518585931BC711F9BA15703C6
sudo
add-apt-repository ppa:ubuntu-toolchain-r/test
sudo
apt update
-qq
sudo
apt
install
-qq
-y
\
g++-8
\
ninja-build
\
qt
${
QT_PKG
}
base
\
qt
${
QT_PKG
}
tools
\
qt
${
QT_PKG
}
svg
\
...
...
This diff is collapsed.
Click to expand it.
.ci/script.sh
+
1
−
0
View file @
f5b9487c
...
...
@@ -3,6 +3,7 @@
set
-ex
if
[
"
$TRAVIS_OS_NAME
"
=
"linux"
]
;
then
export
CC
=
${
C_COMPILER
}
export
CXX
=
${
CXX_COMPILER
}
# make build use all available cores
...
...
This diff is collapsed.
Click to expand it.
azure-pipelines.yml
+
21
−
2
View file @
f5b9487c
...
...
@@ -18,18 +18,37 @@ stages:
pool
:
vmImage
:
'
ubuntu-16.04'
variables
:
CXX_COMPILER
:
'
clang++-5.0'
C_COMPILER
:
'
clang-5.0'
QT_VERSION
:
'
592'
QT_PKG
:
'
59'
USE_BUNDLED_BOOST
:
'
1'
USE_BUNDLED_CMARK
:
'
1'
USE_BUNDLED_JSON
:
'
1'
steps
:
-
template
:
.ci/azure-build.yml
parameters
:
osName
:
'
linux'
-
job
:
macOS
pool
:
vmImage
:
'
macOS-10.13'
variables
:
DEPLOYMENT
:
'
1'
USE_BUNDLED_BOOST
:
'
0'
USE_BUNDLED_CMARK
:
'
0'
USE_BUNDLED_JSON
:
'
0'
steps
:
-
template
:
.ci/azure-build.yml
parameters
:
osName
:
'
osx'
-
job
:
Windows
pool
:
vmImage
:
'
vs2017-win2016'
steps
:
-
template
:
.ci/azure-build.yml
\ No newline at end of file
-
template
:
.ci/azure-build.yml
parameters
:
osName
:
'
windows'
\ No newline at end of file
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