From 8963b4969c0ab4c541b622528677afcfcbb0f8b0 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 11 Apr 2024 14:34:13 +0200 Subject: [PATCH 1/2] Remove LD_LIBRARY_PATH instructions I don't know when this changed but setting LD_LIBRARY_PATH is not necessary, TAGLIB_DIR works fine and this is simpler. --- .github/workflows/ci.yml | 2 +- README.md | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 330962c..4976092 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,4 +82,4 @@ jobs: run: TAGLIB_DIR=$PWD/tmp/$PLATFORM/taglib-$TAGLIB_VERSION bundle exec rake compile - name: Run Tests (taglib-ruby) - run: LD_LIBRARY_PATH=$PWD/tmp/$PLATFORM/taglib-$TAGLIB_VERSION/lib bundle exec rake test + run: TAGLIB_DIR=$PWD/tmp/$PLATFORM/taglib-$TAGLIB_VERSION bundle exec rake test diff --git a/README.md b/README.md index 0d31d2b..922b186 100644 --- a/README.md +++ b/README.md @@ -120,18 +120,14 @@ Build a specific version of Taglib: The above command will automatically download Taglib 1.11.1, build it and install it in `tmp/x86_64-linux/taglib-1.11.1`. -The `swig` and `compile` tasks can then be executed against that specific +The `swig`, `compile` and `test` tasks can then be executed against that specific version of Taglib by setting the `TAGLIB_DIR` environment variable to `$PWD/tmp/x86_64-linux/taglib-1.11.1` (it is assumed that taglib headers are located at `$TAGLIB_DIR/include` and taglib libraries at `$TAGLIB_DIR/lib`). -The `test` task can then be run for that version of Taglib by adding -`$PWD/tmp/x86_64-linux/taglib-1.11.1/lib` to the `LD_LIBRARY_PATH` environment -variable. - To do everything in one command: - PLATFORM=x86_64-linux TAGLIB_VERSION=1.11.1 TAGLIB_DIR=$PWD/tmp/x86_64-linux/taglib-1.11.1 LD_LIBRARY_PATH=$PWD/tmp/x86_64-linux/taglib-1.11.1/lib rake vendor compile test + PLATFORM=x86_64-linux TAGLIB_VERSION=1.11.1 TAGLIB_DIR=$PWD/tmp/x86_64-linux/taglib-1.11.1 rake vendor compile test ### Workflow From 40de2971b5eda3716e5f3fd529db5bb20b22a3cd Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 11 Apr 2024 17:40:55 +0200 Subject: [PATCH 2/2] We do not need TAGLIB_DIR for the tests, only for compiling --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4976092..6918e68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,4 +82,4 @@ jobs: run: TAGLIB_DIR=$PWD/tmp/$PLATFORM/taglib-$TAGLIB_VERSION bundle exec rake compile - name: Run Tests (taglib-ruby) - run: TAGLIB_DIR=$PWD/tmp/$PLATFORM/taglib-$TAGLIB_VERSION bundle exec rake test + run: bundle exec rake test