Skip to content

Commit a853944

Browse files
committed
Installing locate command on gh env
1 parent abfda82 commit a853944

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.github/workflows/workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Install packages
30-
run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev
30+
run: apt-get update && apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev mlocate
3131

3232
- name: asdf_plugin_test
3333
uses: asdf-vm/actions/plugin-test@v1
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Install packages
52-
run: brew install autoconf automake bison bzip2 freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib
52+
run: brew install autoconf automake bison bzip2 freetype gd gettext icu4c krb5 libedit libiconv libjpeg libxml2 libzip pkg-config re2c zlib
5353

5454
- name: asdf_plugin_test
5555
uses: asdf-vm/actions/plugin-test@v1

bin/install

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ install_php() {
2222

2323
local operating_system=$(uname -a)
2424

25-
echo "test2"
26-
echo $(locate libpng)
27-
echo $(locate libjpeg)
28-
exit 1
29-
30-
3125
# many macos packages require modifications to various env variables in order for the build process to pick
3226
# up the correct version of the packages. These checks are done here instead of `construct_configure_options`
3327
# because modifications to $PKG_CONFIG_PATH are not propogated from the subshell to this shell.
@@ -258,10 +252,6 @@ os_based_configure_options() {
258252
missing_required_packages="freetype"
259253
fi
260254

261-
if [ -n "$bison_path" ]; then
262-
missing_required_packages="$missing_required_packages bison"
263-
fi
264-
265255
if [ -n "$gettext_path" ]; then
266256
configure_options="$configure_options --with-gettext=$gettext_path"
267257
else
@@ -341,12 +331,8 @@ os_based_configure_options() {
341331
missing_required_packages="$missing_required_packages libiconv"
342332
fi
343333
else
344-
echo "test"
345-
echo $(locate libpng)
346-
echo $(locate libjpeg)
347-
exit 1
348-
local jpeg_path=$(locate libjpeg | awk '{ print length(), $0 | "sort -n" }' | cut -d" " -f2- | head -n 1)
349-
local libpng_path=$(locate libpng | awk '{ print length(), $0 | "sort -n" }' | cut -d" " -f2- | head -n 1)
334+
local jpeg_path=$(locate libjpeg.so | awk '{ print length(), $0 | "sort -n" }' | cut -d" " -f2- | head -n 1 | xargs dirname)
335+
local libpng_path=$(locate libpng.so | awk '{ print length(), $0 | "sort -n" }' | cut -d" " -f2- | head -n 1 | xargs dirname)
350336
configure_options="--with-openssl --with-curl --with-zlib --with-readline --with-gettext"
351337

352338
if [ "$jpeg_path" = "" ]; then

0 commit comments

Comments
 (0)