Fix release tarballs (#103)

* Fix version for tagged builds * Fix zip building * Remove old commented-out build code
acoustid · Dec 23, 2021 · 6115e2d · 6115e2d
1 parent d2ba5cd
commit 6115e2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -157,7 +157,7 @@ jobs:
         id: version
         run: |
           case $GITHUB_REF in
-            ref/tags/v*)
+            refs/tags/v*)
               VERSION=${GITHUB_REF//refs\/tags\/v/}
               ;;
             *)
@@ -183,7 +183,7 @@ jobs:
             chmod +x tmp/$name/fpcalc*
             if [ -e tmp/$name/fpcalc.exe ]
             then
-              (cd tmp && zip ../artifacts/$name.zip $name/)
+              (cd tmp && zip -r ../artifacts/$name.zip $name)
             else
               tar cvzf artifacts/$name.tar.gz -C tmp $name
             fi
@@ -192,7 +192,7 @@ jobs:
 
       - name: List tarballs
         run: |
-          find artifacts/
+          ls -l artifacts/
 
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/package/build.sh b/package/build.sh
@@ -96,53 +96,6 @@ CMAKE_ARGS+=(
     -DCMAKE_INSTALL_PREFIX=$BASE_DIR/artifacts
 )
 
-#case $OS in
-#windows)
-#    perl -pe "s!{EXTRA_PATHS}!$FFMPEG_DIR!g" $BASE_DIR/package/toolchain-mingw.cmake.in | perl -pe "s!{ARCH}!$ARCH!g" >toolchain.cmake
-#    CMAKE_ARGS+=(
-#        -DCMAKE_TOOLCHAIN_FILE=$TMP_BUILD_DIR/toolchain.cmake
-#        -DCMAKE_C_FLAGS='-static -static-libgcc -static-libstdc++'
-#        -DCMAKE_CXX_FLAGS='-static -static-libgcc -static-libstdc++'
-#        -DHAVE_AV_PACKET_UNREF=1
-#        -DHAVE_AV_FRAME_ALLOC=1
-#        -DHAVE_AV_FRAME_FREE=1
-#    )
-#    STRIP=$ARCH-w64-mingw32-strip
-#    ;;
-#linux)
-#    case $ARCH in
-#    i686)
-#        CMAKE_ARGS+=(
-#            -DCMAKE_C_FLAGS='-m32 -static -static-libgcc -static-libstdc++'
-#            -DCMAKE_CXX_FLAGS='-m32 -static -static-libgcc -static-libstdc++'
-#        )
-#        ;;
-#    x86_64)
-#        CMAKE_ARGS+=(
-#            -DCMAKE_C_FLAGS='-static -static-libgcc -static-libstdc++'
-#            -DCMAKE_CXX_FLAGS='-static -static-libgcc -static-libstdc++'
-#        )
-#        ;;
-#    arm*)
-#        perl -pe "s!{EXTRA_PATHS}!$FFMPEG_DIR!g" $BASE_DIR/package/toolchain-armhf.cmake.in | perl -pe "s!{ARCH}!$ARCH!g" >toolchain.cmake
-#        CMAKE_ARGS+=(
-#            -DCMAKE_TOOLCHAIN_FILE=$TMP_BUILD_DIR/toolchain.cmake
-#            -DCMAKE_C_FLAGS='-static -static-libgcc -static-libstdc++'
-#            -DCMAKE_CXX_FLAGS='-static -static-libgcc -static-libstdc++'
-#        )
-#        STRIP=arm-linux-gnueabihf-strip
-#        ;;
-#    *)
-#        echo "unsupported architecture ($ARCH)"
-#        exit 1
-#    esac
-#    ;;
-#*)
-#    echo "unsupported OS ($OS)"
-#    exit 1
-#    ;;
-#esac
-
 cmake "${CMAKE_ARGS[@]}" $BASE_DIR
 
 VERSION=${GITHUB_REF##*/}