Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Make release binary names more consistent 

Now that we have multiple architectures, we should factor both OS and
architecture into the names of release binaries.  This makes the names
more formulaic, as well as consistent with the static-ffmpeg-binaries
repository.  Shaka Streamer will pull binaries from both this repo and
that one, so consistent names would be helpful.

The pssh-box release is actually OS and architecture independent, so
remove the suffix from that and only release one copy of it.

Change-Id: Ief3de49fae267c5267647a8dd4377023777ead37
This commit is contained in:
Joey Parrish 2021-08-26 09:46:21 -07:00
parent 249c83f14b
commit bbd0a1afa6
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_and_test.yaml vendored
View File

@ -59,12 +59,12 @@ jobs:
# 64-bit outputs on Windows go to a different folder name. # 64-bit outputs on Windows go to a different folder name.
build_type_suffix: "_x64" build_type_suffix: "_x64"
- os: linux-arm64 - os: linux-arm64
os_name: linux-arm64 os_name: linux
target_arch: arm64 target_arch: arm64
exe_ext: "" exe_ext: ""
build_type_suffix: "" build_type_suffix: ""
name: Build and test ${{ matrix.os_name }} ${{ matrix.build_type }} ${{ matrix.lib_type }} name: Build and test ${{ matrix.os_name }} ${{ matrix.target_arch }} ${{ matrix.build_type }} ${{ matrix.lib_type }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

21
.github/workflows/custom-actions/build-packager/action.yaml vendored
View File

@ -137,22 +137,19 @@ runs:
strip packager${{ inputs.exe_ext }} strip packager${{ inputs.exe_ext }}
strip mpd_generator${{ inputs.exe_ext }} strip mpd_generator${{ inputs.exe_ext }}
echo "::endgroup::" echo "::endgroup::"
SUFFIX="-${{ inputs.os_name }}-${{ inputs.target_arch }}"
EXE_SUFFIX="$SUFFIX${{ inputs.exe_ext}}"
echo "::group::Copy packager" echo "::group::Copy packager"
cp packager${{ inputs.exe_ext }} \ cp packager${{ inputs.exe_ext }} $ARTIFACTS/packager$EXE_SUFFIX
$ARTIFACTS/packager-${{ inputs.os_name }}${{ inputs.exe_ext }}
echo "::endgroup::" echo "::endgroup::"
echo "::group::Copy mpd_generator" echo "::group::Copy mpd_generator"
cp mpd_generator${{ inputs.exe_ext }} \ cp mpd_generator${{ inputs.exe_ext }} $ARTIFACTS/mpd_generator$EXE_SUFFIX
$ARTIFACTS/mpd_generator-${{ inputs.os_name }}${{ inputs.exe_ext }}
echo "::endgroup::" echo "::endgroup::"
if [[ '${{ runner.os }}' == 'Windows' ]]; then # The pssh-box bundle is OS and architecture independent. So only do
echo "::group::Zip pssh-box" # it on this one OS and architecture, and give it a more generic
7z a $ARTIFACTS/pssh-box-${{ inputs.os_name }}.py.zip \ # filename.
pyproto pssh-box.py if [[ '${{ inputs.os_name }}' == 'linux' && '${{ inputs.target_arch }}' == 'x64' ]]; then
echo "::endgroup::"
else
echo "::group::Tar pssh-box" echo "::group::Tar pssh-box"
tar -czf $ARTIFACTS/pssh-box-${{ inputs.os_name }}.py.tar.gz \ tar -czf $ARTIFACTS/pssh-box.py.tar.gz pyproto pssh-box.py
pyproto pssh-box.py
echo "::endgroup::" echo "::endgroup::"
fi fi

4
.github/workflows/github_release.yaml vendored
View File

@ -133,12 +133,12 @@ jobs:
# 64-bit outputs on Windows go to a different folder name. # 64-bit outputs on Windows go to a different folder name.
build_type_suffix: "_x64" build_type_suffix: "_x64"
- os: linux-arm64 - os: linux-arm64
os_name: linux-arm64 os_name: linux
target_arch: arm64 target_arch: arm64
exe_ext: "" exe_ext: ""
build_type_suffix: "" build_type_suffix: ""
name: Build and test ${{ matrix.os_name }} ${{ matrix.build_type }} ${{ matrix.lib_type }} name: Build and test ${{ matrix.os_name }} ${{ matrix.target_arch }} ${{ matrix.build_type }} ${{ matrix.lib_type }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps: