From bbd0a1afa6aa43e45505d927cdc9f17199b726e9 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Thu, 26 Aug 2021 09:46:21 -0700
Subject: [PATCH] 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
---
 .github/workflows/build_and_test.yaml         |  4 ++--
 .../custom-actions/build-packager/action.yaml | 21 ++++++++-----------
 .github/workflows/github_release.yaml         |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index 26f4bfcc08..cce0e26829 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -59,12 +59,12 @@ jobs:
             # 64-bit outputs on Windows go to a different folder name.
             build_type_suffix: "_x64"
           - os: linux-arm64
-            os_name: linux-arm64
+            os_name: linux
             target_arch: arm64
             exe_ext: ""
             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 }}
 
     steps:
diff --git a/.github/workflows/custom-actions/build-packager/action.yaml b/.github/workflows/custom-actions/build-packager/action.yaml
index 11d961f5ca..c875bb7844 100644
--- a/.github/workflows/custom-actions/build-packager/action.yaml
+++ b/.github/workflows/custom-actions/build-packager/action.yaml
@@ -137,22 +137,19 @@ runs:
         strip packager${{ inputs.exe_ext }}
         strip mpd_generator${{ inputs.exe_ext }}
         echo "::endgroup::"
+        SUFFIX="-${{ inputs.os_name }}-${{ inputs.target_arch }}"
+        EXE_SUFFIX="$SUFFIX${{ inputs.exe_ext}}"
         echo "::group::Copy packager"
-        cp packager${{ inputs.exe_ext }} \
-            $ARTIFACTS/packager-${{ inputs.os_name }}${{ inputs.exe_ext }}
+        cp packager${{ inputs.exe_ext }} $ARTIFACTS/packager$EXE_SUFFIX
         echo "::endgroup::"
         echo "::group::Copy mpd_generator"
-        cp mpd_generator${{ inputs.exe_ext }} \
-            $ARTIFACTS/mpd_generator-${{ inputs.os_name }}${{ inputs.exe_ext }}
+        cp mpd_generator${{ inputs.exe_ext }} $ARTIFACTS/mpd_generator$EXE_SUFFIX
         echo "::endgroup::"
-        if [[ '${{ runner.os }}' == 'Windows' ]]; then
-          echo "::group::Zip pssh-box"
-          7z a $ARTIFACTS/pssh-box-${{ inputs.os_name }}.py.zip \
-              pyproto pssh-box.py
-          echo "::endgroup::"
-        else
+        # The pssh-box bundle is OS and architecture independent.  So only do
+        # it on this one OS and architecture, and give it a more generic
+        # filename.
+        if [[ '${{ inputs.os_name }}' == 'linux' && '${{ inputs.target_arch }}' == 'x64' ]]; then
           echo "::group::Tar pssh-box"
-          tar -czf $ARTIFACTS/pssh-box-${{ inputs.os_name }}.py.tar.gz \
-              pyproto pssh-box.py
+          tar -czf $ARTIFACTS/pssh-box.py.tar.gz pyproto pssh-box.py
           echo "::endgroup::"
         fi
diff --git a/.github/workflows/github_release.yaml b/.github/workflows/github_release.yaml
index 235e0f7c5b..6bb9e41ad1 100644
--- a/.github/workflows/github_release.yaml
+++ b/.github/workflows/github_release.yaml
@@ -133,12 +133,12 @@ jobs:
             # 64-bit outputs on Windows go to a different folder name.
             build_type_suffix: "_x64"
           - os: linux-arm64
-            os_name: linux-arm64
+            os_name: linux
             target_arch: arm64
             exe_ext: ""
             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 }}
 
     steps: