From 1ea45f8ff0c5b6c56cbe6b4ecece9d76f2775edd Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Fri, 16 Aug 2024 08:48:55 -0500 Subject: [PATCH] Clean up release methods --- .forgejo/workflows/build.yml | 11 ++++++++--- build.sh | 12 ++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e7e4e73..e46b200 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,8 +1,8 @@ name: Build wine on: - push: - branches: [ main ] + release: + types: [ published ] jobs: build: @@ -14,7 +14,12 @@ jobs: run: | bash ./build.sh + - name: Extract version from build.sh + shell: bash + run: | + echo "VER=$(grep "^tag" build.sh | sed -E 's/tag\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV + - uses: actions/upload-artifact@v3 with: - name: Wine + name: Wine ${{ env.VER }} path: ./*.tar.* diff --git a/build.sh b/build.sh index 67dd012..b9f466f 100644 --- a/build.sh +++ b/build.sh @@ -30,13 +30,13 @@ run_cmd "cd wine && mkdir -p build" run_cmd "cd wine/build && ../configure --enable-win64 --without-ldap --without-oss --disable-winemenubuilder --disable-win16 --disable-tests --prefix /root/musl" run_cmd "cd wine/build && make -j$(nproc) && make install" -sudo cp -R root/root/root/musl wine-staging-tkg-musl -sudo cp wine-staging-tkg-musl/bin/wine64 wine-staging-tkg-musl/bin/wine -sudo chown --reference=build.sh -R wine-staging-tkg-musl/ -sudo chmod 0777 -R wine-staging-tkg-musl/ -tar -czvf wine-$tag-staging-tkg-musl.tar.gz wine-staging-tkg-musl/ +sudo cp -R root/root/root/musl wine-$tag-staging-tkg-musl +sudo cp wine-$tag-staging-tkg-musl/bin/wine64 wine-$tag-staging-tkg-musl/bin/wine +sudo chown --reference=build.sh -R wine-$tag-staging-tkg-musl/ +sudo chmod 0777 -R wine-$tag-staging-tkg-musl/ +tar -czvf wine-$tag-staging-tkg-musl.tar.gz wine-$tag-staging-tkg-musl/ sha256sum wine-$tag-staging-tkg-musl.tar.gz > wine-$tag-staging-tkg-musl.tar.gz.sha256 -rm -rf wine-staging-tkg-musl/ +rm -rf wine-$tag-staging-tkg-musl/ root/root/destroy --remove rm -rf root/