From d905ea354e02572078dae08bb033a07155fa671f Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 12 Aug 2024 10:25:07 +0300 Subject: [PATCH] scripts: gha: do not waste time building bshift, just copy binary from mobile_hacks --- .github/workflows/c-cpp.yml | 3 ++- scripts/gha/build_nswitch_docker.sh | 6 +++++- scripts/gha/build_psvita.sh | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 87009bf0e..3f3a41c94 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -98,7 +98,8 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - name: Remove old release - run: gh release delete -y --cleanup-tag -R $GITHUB_REPOSITORY ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }} + run: | + gh release delete -y --cleanup-tag -R $GITHUB_REPOSITORY ${{ github.ref_name == 'master' && 'continuous' || format('continuous-{0}', github.ref_name) }} || true env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Fetch artifacts diff --git a/scripts/gha/build_nswitch_docker.sh b/scripts/gha/build_nswitch_docker.sh index 331f0f299..00e76a6bf 100644 --- a/scripts/gha/build_nswitch_docker.sh +++ b/scripts/gha/build_nswitch_docker.sh @@ -50,5 +50,9 @@ echo "Building HLSDK..." pushd hlsdk-portable || die build_hlsdk mobile_hacks valve build_hlsdk opfor gearbox -build_hlsdk bshift bshift +popd + +# bshift can be used from mobile_hacks branch +pushd pkgtemp/xash3d +cp -v valve/dlls/hl_nswitch_arm64.so bshift/dlls/bshift_nswitch_arm64.so popd diff --git a/scripts/gha/build_psvita.sh b/scripts/gha/build_psvita.sh index 014fd4df7..5bf538d44 100644 --- a/scripts/gha/build_psvita.sh +++ b/scripts/gha/build_psvita.sh @@ -53,7 +53,11 @@ echo "Building HLSDK..." pushd hlsdk-portable || die build_hlsdk mobile_hacks valve build_hlsdk opfor gearbox -build_hlsdk bshift bshift +popd + +# bshift can be used from mobile_hacks branch +pushd pkgtemp/data/xash3d +cp -v valve/dlls/hl_psvita_armv7hf.so bshift/dlls/bshift_psvita_armv7hf.so popd echo "Generating default config files..."