summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfalkTX <falktx@falktx.com>2021-08-02 12:15:08 +0100
committerfalkTX <falktx@falktx.com>2021-08-02 12:15:08 +0100
commitb3dd666c66db87e7e8e0b71a24ba2f28355a87d6 (patch)
treea62e941daf901424115f8f06a4979eacc5f93afc
parent8333ea57cfadf8a82e83e24e075ff18ca98f569e (diff)
downloadjack2-b3dd666c66db87e7e8e0b71a24ba2f28355a87d6.tar.gz
CI: Fix macOS package path
Signed-off-by: falkTX <falktx@falktx.com>
-rw-r--r--.github/workflows/build.yml12
1 files changed, 2 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 168c23d7..b4afcfba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
- name: Generate macOS package
shell: bash
run: |
- ./macosx/generate-pkg.sh $(pwd)/destdir ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
+ ./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
- uses: actions/upload-artifact@v2
with:
name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -95,21 +95,13 @@ jobs:
python ./waf configure --platform=darwin --prefix=/usr/local
python ./waf build -j $(sysctl -n hw.logicalcpu)
python ./waf install --destdir=$(pwd)/destdir
- #- name: Patch binaries
- #shell: bash
- #run: |
- #pushd $(pwd)/destdir
- #for f in $(ls bin/* lib/*.dylib lib/jack/*); do
- #install_name_tool -change "${PAWPAW_PREFIX}/jack2/lib/libjack.0.dylib" "/usr/local/lib/libjack.0.dylib" "${f}"
- #install_name_tool -change "${PAWPAW_PREFIX}/jack2/lib/libjacknet.0.dylib" "/usr/local/lib/libjacknet.0.dylib" "${f}"
- #install_name_tool -change "${PAWPAW_PREFIX}/jack2/lib/libjackserver.0.dylib" "/usr/local/lib/libjackserver.0.dylib" "${f}"
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- name: Generate macOS package
shell: bash
run: |
- ./macosx/generate-pkg.sh $(pwd)/destdir ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
+ ./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
- uses: actions/upload-artifact@v2
with:
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}