Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7e16a0d

Browse filesBrowse files
minor #28866 [travis] build libsodium only if it's not already enabled (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- [travis] build libsodium only if it's not already enabled | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Should make the CI green. Commits ------- 24a00d8 [travis] build libsodium only if it's not already enabled
2 parents a5792bf + 24a00d8 commit 7e16a0d
Copy full SHA for 7e16a0d

File tree

Expand file treeCollapse file tree

1 file changed

+7
-5
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-5
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,15 @@ before_install:
173173
[[ -e $ext_cache ]] || (tfold ext.symfony_debug "cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && mv modules/symfony_debug.so $ext_cache && phpize --clean")
174174
echo extension = $ext_cache >> $INI
175175
elif [[ $PHP = 7.* ]]; then
176-
# install libsodium
177-
sudo add-apt-repository ppa:ondrej/php -y
178-
sudo apt-get update -q
179-
sudo apt-get install libsodium-dev -y
176+
if ! php --ri sodium > /dev/null; then
177+
# install libsodium
178+
sudo add-apt-repository ppa:ondrej/php -y
179+
sudo apt-get update -q
180+
sudo apt-get install libsodium-dev -y
181+
tfold ext.libsodium tpecl libsodium sodium.so $INI
182+
fi
180183
181184
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
182-
tfold ext.libsodium tpecl libsodium sodium.so $INI
183185
tfold ext.mongodb tpecl mongodb-1.5.0 mongodb.so $INI
184186
fi
185187
done

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.