From 493a48b2639be73aec7b0fd8087f9afa10ab1d55 Mon Sep 17 00:00:00 2001 From: Xerbo Date: Sat, 21 Jan 2023 22:54:28 +0000 Subject: [PATCH] Fix incorrect path --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- build_windows.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d49bb48..96197d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,13 +33,13 @@ jobs: uses: actions/upload-artifact@v3 with: name: TGZ package - path: build/aptdec/aptdec_*.tar.gz + path: build/aptdec_*.tar.gz - name: Upload DEB package uses: actions/upload-artifact@v3 with: name: Debian package - path: build/aptdec/aptdec_*.deb + path: build/aptdec_*.deb build_windows: runs-on: ubuntu-latest @@ -60,4 +60,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ZIP package - path: build/aptdec/aptdec_*.zip + path: build/aptdec_*.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e249d56..6eb4f4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,13 +59,13 @@ jobs: uses: actions/upload-artifact@v3 with: name: TGZ package - path: build/aptdec/aptdec_*.tar.gz + path: build/aptdec_*.tar.gz - name: Upload DEB package uses: actions/upload-artifact@v3 with: name: Debian package - path: build/aptdec/aptdec_*.deb + path: build/aptdec_*.deb build_windows: runs-on: ubuntu-latest @@ -86,4 +86,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ZIP package - path: build/aptdec/aptdec_*.zip + path: build/aptdec_*.zip diff --git a/build_windows.sh b/build_windows.sh index 5fa5c4a..3f178a5 100755 --- a/build_windows.sh +++ b/build_windows.sh @@ -33,8 +33,8 @@ if [ ! -d libsndfile-1.2.0-win64 ]; then fi # Copy required GCC libs -cp $(find /usr | grep libgcc_s_seh-1.dll) $TEMP_PATH/bin -cp $(find /usr | grep libwinpthread-1.dll) $TEMP_PATH/bin +cp $(find /usr | grep libgcc_s_seh-1.dll | head -n 1) $TEMP_PATH/bin +cp $(find /usr | grep libwinpthread-1.dll | head -n 1) $TEMP_PATH/bin # Build aptdec cmake -B $BUILD_DIR -DCMAKE_BUILD_TYPE=$1 -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$TEMP_PATH