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
c9566369
Verified
Commit
c9566369
authored
5 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Even more bash fixes >.<
parent
8fe44c24
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
+2
-2
2 additions, 2 deletions
.ci/install.sh
.ci/script.sh
+2
-2
2 additions, 2 deletions
.ci/script.sh
with
4 additions
and
4 deletions
.ci/install.sh
+
2
−
2
View file @
c9566369
...
...
@@ -39,7 +39,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
UBUNTU_RELEASE
=
$(
lsb_release
-sc
)
if
[
"
$UBUNTU_RELEASE
"
eq
"trusty"
]
;
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"
...
...
@@ -49,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
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
"
eq
"xenial"
]
;
then
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-get update
-qq
...
...
This diff is collapsed.
Click to expand it.
.ci/script.sh
+
2
−
2
View file @
c9566369
...
...
@@ -41,11 +41,11 @@ cmake --build build
if
[
"
$TRAVIS_OS_NAME
"
=
"osx"
]
;
then
make lint
;
if
[
"
$DEPLOYMENT
"
=
1
]
&&
[
!
-z
"
$VERSION
"
]
;
then
if
[
"
$DEPLOYMENT
"
=
1
]
&&
[
-n
"
$VERSION
"
]
;
then
make macos-deploy
;
fi
fi
if
[
"
$TRAVIS_OS_NAME
"
=
"linux"
]
&&
[
"
$DEPLOYMENT
"
=
1
]
&&
[
!
-z
"
$VERSION
"
]
;
then
if
[
"
$TRAVIS_OS_NAME
"
=
"linux"
]
&&
[
"
$DEPLOYMENT
"
=
1
]
&&
[
-n
"
$VERSION
"
]
;
then
make linux-deploy
;
fi
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