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
349d2109
Verified
Commit
349d2109
authored
5 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Fix travis build failing due to azure changes
parent
a4e7e248
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.ci/install.sh
+8
-6
8 additions, 6 deletions
.ci/install.sh
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
with
9 additions
and
7 deletions
.ci/install.sh
+
8
−
6
View file @
349d2109
...
...
@@ -46,25 +46,27 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
if
[
"
$UBUNTU_RELEASE
"
=
"trusty"
]
;
then
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
sudo
apt-key add -
sudo
apt-add-repository
"deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main"
sudo
apt-add-repository
-y
"deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty
-5.0
main"
sudo
apt-get update
-qq
sudo
apt-get
install
-qq
-y
clang-5.0
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
elif
[
"
$UBUNTU_RELEASE
"
=
"xenial"
]
;
then
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
sudo
apt-key add -
sudo
apt-add-repository
"deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
sudo
apt-add-repository
-y
"deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
sudo
apt-get update
-qq
sudo
apt-get
install
-qq
-y
clang-6.0
sudo
add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial
sudo
add-apt-repository
-y
ppa:beineri/opt-qt-5.11.1-xenial
fi
# needed for git-lfs, otherwise the follow apt update fails.
sudo
apt-key adv
--keyserver
hkp://keyserver.ubuntu.com:80
--recv-keys
6B05F25D762E3157
# 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
add-apt-repository
-y
ppa:ubuntu-toolchain-r/test
sudo
apt update
-qq
sudo
apt
install
-qq
-y
\
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
349d2109
...
...
@@ -105,7 +105,7 @@ if(NOT MSVC)
-fsized-deallocation \
-fdiagnostics-color=always \
-Wunreachable-code \
-std=c++14"
-std=c++14"
)
if
(
NOT CMAKE_COMPILER_IS_GNUCXX
)
# -Wshadow is buggy and broken in GCC, so do not enable it.
...
...
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