shaka-player 4.6.14 → 4.6.16

package/.github/workflows/appspot.yaml

@@ -15,24 +15,24 @@ jobs:
   appspot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
 
       - uses: ./.github/workflows/custom-actions/prep-for-appspot
 
-      - uses: google-github-actions/auth@v0
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: '${{ secrets.APPENGINE_DEPLOY_KEY }}'
 
-      - uses: google-github-actions/deploy-appengine@v0
+      - uses: google-github-actions/deploy-appengine@v2
         with:
           project_id: shaka-player-demo
           version: ${{ inputs.subdomain }}

package/.github/workflows/build-and-test.yaml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.ref }}
 
@@ -89,7 +89,7 @@ jobs:
         run: sudo apt -y update && sudo apt -y install ffmpeg
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.ref }}
 
@@ -128,7 +128,7 @@ jobs:
 
       # Some CI images (self-hosted or otherwise) don't have the minimum Java
       # version necessary for the compiler (Java 11).
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11
@@ -178,7 +178,7 @@ jobs:
           fi
 
       - name: Upload coverage reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() && steps.coverage.outputs.coverage_found }}
         with:
           name: coverage
@@ -194,7 +194,7 @@ jobs:
 
       # Upload new screenshots and diffs on failure; ignore if missing
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: screenshots-${{ matrix.browser }}
@@ -212,7 +212,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.ref }}
 

package/.github/workflows/custom-actions/set-commit-status/action.yaml

@@ -14,6 +14,9 @@ inputs:
   token:
     description: A GitHub access token.
     required: true
+  job_name:
+    description: A job name, so that the status' target URL can point to a specific job.
+    required: false
 
 runs:
   using: composite
@@ -21,17 +24,36 @@ runs:
     - name: Report Commit Status
       shell: bash
       run: |
-        # This is the URL to view this workflow run on GitHub.  It will be
-        # attached to the commit status, so that when someone clicks "details"
-        # next to the status on the PR, it will link to this run where they can
-        # see the logs.
-        RUN_URL="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
+        export GITHUB_TOKEN="${{ inputs.token }}"
+
+        # Here we compute a "target URL".  It will be attached to the commit
+        # status, so that when someone clicks "details" next to the status on
+        # the PR, it will link to the appropriate logs.
+        if [[ "${{ inputs.job_name }}" != "" ]]; then
+          # There are three identifiers for the job:
+          #   - The job's key in YAML, which is "github.job"
+          #   - The job's name, which is not provided by any runner environment
+          #   - The job's numerical ID, which is not provided either
+          # To link to this specific job in the status, we need the numerical
+          # job ID.  The GH API provides a list of jobs, which contain
+          # numerical IDs and names, but not keys.  So the caller of this
+          # action must provide the string name, and then we look up the
+          # numerical ID in the API.  "github.job" is useless here.
+          job_id=$(
+            gh api /repos/${{github.repository}}/actions/runs/${{github.run_id}}/jobs \
+                | jq '.jobs | map(select(.name=="${{ inputs.job_name }}")) | .[].id'
+          )
+          TARGET_URL="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}/job/$job_id"
+        else
+          # Generic link to the run, without any specific job.
+          TARGET_URL="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
+        fi
+
         SHA1=$(git rev-parse HEAD)
 
-        GITHUB_TOKEN=${{ inputs.token }} \
         gh api \
           -X POST \
           -F "context=${{ inputs.context }}" \
           -F "state=${{ inputs.state }}" \
-          -F "target_url=$RUN_URL" \
+          -F "target_url=$TARGET_URL" \
           "repos/${{ github.repository }}/statuses/$SHA1"

package/.github/workflows/demo-version-index.yaml

@@ -22,19 +22,19 @@ jobs:
   appspot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # We need a list of all tags for this, so fetch the entire history.
           fetch-depth: 0
 
-      - uses: google-github-actions/auth@v0
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: '${{ secrets.APPENGINE_DEPLOY_KEY }}'
 
       - name: Generate static content
         run: python3 app-engine/demo-version-index/generate.py
 
-      - uses: google-github-actions/deploy-appengine@v0
+      - uses: google-github-actions/deploy-appengine@v2
         with:
           project_id: shaka-player-demo
           version: index

package/.github/workflows/nightly-demo.yaml

@@ -11,12 +11,12 @@ jobs:
   appspot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
@@ -31,11 +31,11 @@ jobs:
 
       - uses: ./.github/workflows/custom-actions/prep-for-appspot
 
-      - uses: google-github-actions/auth@v0
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: '${{ secrets.APPENGINE_DEPLOY_KEY }}'
 
-      - uses: google-github-actions/deploy-appengine@v0
+      - uses: google-github-actions/deploy-appengine@v2
         with:
           project_id: shaka-player-demo
           version: nightly

package/.github/workflows/release-please.yaml

@@ -12,19 +12,19 @@ jobs:
     outputs:
       release_created: ${{ steps.release.outputs.release_created }}
       tag_name: ${{ steps.release.outputs.tag_name }}
+      patch: ${{ steps.release.outputs.patch }}
     steps:
       # Create/update release PR
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         id: release
         with:
-          # Required input to specify the release type (node package).
-          release-type: node
           # Make sure we create the PR against the correct branch.
-          default-branch: ${{ github.ref_name }}
+          target-branch: ${{ github.ref_name }}
           # Use a special shaka-bot access token for releases.
           token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
-          # Update these additional files containing version numbers.
-          extra-files: lib/player.js
+          # See also settings in these files:
+          manifest-file: .release-please-manifest.json
+          config-file: .release-please-config.json
 
   # The jobs below are all conditional on a release having been created by
   # someone merging the release PR.  They all run in parallel.
@@ -32,9 +32,9 @@ jobs:
   tag-main:
     runs-on: ubuntu-latest
     needs: release
-    if: needs.release.outputs.release_created && endsWith(needs.release.outputs.tag_name, '.0') == false
+    if: needs.release.outputs.release_created && needs.release.outputs.patch == '0'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Check out the origin repo, and do it at main, not the PR branch.
           ref: main
@@ -55,12 +55,12 @@ jobs:
     needs: release
     if: needs.release.outputs.release_created
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
@@ -113,25 +113,26 @@ jobs:
           fi
 
       - run: npm pack
-      - uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ needs.release.outputs.tag_name }}
-          file: shaka-player-*.tgz
-          file_glob: true
-          overwrite: true
+
+      - name: Attach to release
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+        run: |
+          gh release upload \
+              ${{ needs.release.outputs.tag_name }} shaka-player-*.tgz \
+              --clobber
 
   appspot:
     runs-on: ubuntu-latest
     needs: release
     if: needs.release.outputs.release_created
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
@@ -165,11 +166,11 @@ jobs:
 
       - uses: ./.github/workflows/custom-actions/prep-for-appspot
 
-      - uses: google-github-actions/auth@v0
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: '${{ secrets.APPENGINE_DEPLOY_KEY }}'
 
-      - uses: google-github-actions/deploy-appengine@v0
+      - uses: google-github-actions/deploy-appengine@v2
         with:
           project_id: shaka-player-demo
           version: ${{ env.APPSPOT_SUBDOMAIN }}
@@ -178,9 +179,9 @@ jobs:
   auto-branch:
     runs-on: ubuntu-latest
     needs: release
-    if: needs.release.outputs.release_created && endsWith(needs.release.outputs.tag_name, '.0')
+    if: needs.release.outputs.release_created && needs.release.outputs.patch == '0'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           # Use a special shaka-bot access token for releases.

package/.github/workflows/report-incremental-coverage.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Compute incremental code coverage
         id: compute

package/.github/workflows/selenium-lab-tests.yaml

@@ -31,9 +31,17 @@ on:
         required: false
         type: string
       ignore_test_status:
-        description: "If true, ignore test success or failure, never set the commit status, and always upload screenshots."
+        description: "If true, ignore test success or failure, and always upload screenshots."
         required: false
         type: boolean
+      skip_commit_status:
+        description: "If true, skip the commit status."
+        required: false
+        type: boolean
+      job_name_prefix:
+        description: "A prefix added to the job name when setting commit status, needed to correctly link to each job.  Use when skip_commit_status is false, and set to the name of the parent job, plus space-slash-space."
+        required: false
+        type: string
   schedule:
     # Runs every night at 2am PST / 10am UTC, testing against the main branch.
     - cron: '0 10 * * *'
@@ -71,7 +79,7 @@ jobs:
       INCLUDE: ${{ steps.configure.outputs.INCLUDE }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ needs.compute-ref.outputs.REF }}
 
@@ -133,15 +141,16 @@ jobs:
     needs: compute-ref
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ needs.compute-ref.outputs.REF }}
 
       - name: Set commit status to pending
-        if: ${{ inputs.ignore_test_status == false }}
+        if: ${{ inputs.skip_test_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / Build
+          job_name: "${{ inputs.job_name_prefix }}Pre-build Player"
           state: pending
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -159,21 +168,21 @@ jobs:
               --filter ThisFilterMatchesNoTests || true
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: npm-cache
         with:
           path: node_modules/
           key: node-${{ hashFiles('package-lock.json') }}
 
       - name: Cache Babel output
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: babel-cache
         with:
           path: .babel-cache
           key: babel-${{ hashFiles('*.js', 'demo/**.js', 'lib/**.js', 'ui/**.js', 'test/**.js', 'third_party/**.js') }}
 
       - name: Store Player build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: shaka-player
           path: dist/
@@ -182,10 +191,11 @@ jobs:
       - name: Report final commit status
         # Will run on success or failure, but not if the workflow is cancelled
         # or if we were asked to ignore the test status.
-        if: ${{ (success() || failure()) && inputs.ignore_test_status == false }}
+        if: ${{ (success() || failure()) && inputs.skip_commit_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / Build
+          job_name: "${{ inputs.job_name_prefix }}Pre-build Player"
           state: ${{ job.status }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -201,31 +211,32 @@ jobs:
     name: ${{ matrix.browser }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ needs.compute-ref.outputs.REF }}
 
       - name: Set commit status to pending
-        if: ${{ inputs.ignore_test_status == false }}
+        if: ${{ inputs.skip_commit_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / ${{ matrix.browser }}
+          job_name: "${{ inputs.job_name_prefix }}${{ matrix.browser }}"
           state: pending
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
 
       # The Docker image for this self-hosted runner doesn't contain java.
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: npm-cache
         with:
           path: node_modules/
@@ -234,7 +245,7 @@ jobs:
           enableCrossOsArchive: true  # Share archives from Linux to Windows
 
       - name: Cache Babel output
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: babel-cache
         with:
           path: .babel-cache
@@ -249,7 +260,7 @@ jobs:
       # Instead of building Shaka N times, build it once and fetch the build to
       # each Selenium runner in the matrix.
       - name: Fetch Player build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: shaka-player
           path: dist/
@@ -331,7 +342,7 @@ jobs:
           fi
 
       - name: Upload coverage report (Edge only)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         # If there's a coverage report, upload it, even if a previous step
         # failed.
         if: ${{ always() && steps.coverage.outputs.coverage_report }}
@@ -347,7 +358,7 @@ jobs:
 
       # Upload new screenshots and diffs on failure; ignore if missing
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ failure() || inputs.ignore_test_status }}
         with:
           # In this workflow, "browser" is the selenium node name, which can
@@ -362,9 +373,10 @@ jobs:
       - name: Report final commit status
         # Will run on success or failure, but not if the workflow is cancelled
         # or if we were asked to ignore the test status.
-        if: ${{ (success() || failure()) && inputs.ignore_test_status == false }}
+        if: ${{ (success() || failure()) && inputs.skip_commit_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / ${{ matrix.browser }}
+          job_name: "${{ inputs.job_name_prefix }}${{ matrix.browser }}"
           state: ${{ job.status }}
           token: ${{ secrets.GITHUB_TOKEN }}

package/.github/workflows/shaka-bot-commands/lib.sh

@@ -64,20 +64,45 @@ function start_workflow() {
   gh workflow run "$WORKFLOW" -R "$THIS_REPO" "${GH_ARGS[@]}"
 }
 
+# Simple alias for converting a stream of text to lowercase.
+function tolower() {
+  tr '[:upper:]' '[:lower:]'
+}
+
 # Outputs to global variables SHAKA_BOT_COMMAND and SHAKA_BOT_ARGUMENTS (array).
 function parse_command() {
-  # Tokenize the comment by whitespace.
-  local TOKENS=( $COMMENT_BODY )
-
-  local INDEX
-  for (( INDEX=0; INDEX < ${#TOKENS[@]}; INDEX++ )); do
-    if [[ "${TOKENS[i]}" == "@shaka-bot" ]]; then
-      SHAKA_BOT_COMMAND="${TOKENS[i+1]}"
-      # A slice of all tokens starting with index i+2.
-      SHAKA_BOT_ARGUMENTS=( "${TOKENS[@]:i+2}" )
-      return 0
-    fi
-  done
+  echo "Parsing comment.  Body: \"$COMMENT_BODY\""
+
+  # Read each line one at a time.  Tokens from one line won't affect another.
+  local COMMENT_LINE
+  while read COMMENT_LINE; do
+    echo "Parsing comment.  Line: \"$COMMENT_LINE\""
+
+    # Tokenize the line by whitespace.
+    local TOKENS=( $COMMENT_LINE )
+
+    local INDEX
+    for (( INDEX=0; INDEX < ${#TOKENS[@]}; INDEX++ )); do
+      if [[ "${TOKENS[INDEX]}" == "@shaka-bot" ]]; then
+        # The next word is the command.
+        SHAKA_BOT_COMMAND=$(echo "${TOKENS[INDEX+1]}" | tolower)
+
+        # Unless it's please, then it's the word after that.
+        if [[ "$SHAKA_BOT_COMMAND" == "please" ]]; then
+          INDEX=$((INDEX + 1))
+          SHAKA_BOT_COMMAND=$(echo "${TOKENS[INDEX+1]}" | tolower)
+        fi
+
+        # A slice of all tokens starting with index INDEX+2.
+        SHAKA_BOT_ARGUMENTS=( "${TOKENS[@]:INDEX+2}" )
+        return 0
+      fi
+    done
+  done < <(echo "$COMMENT_BODY" | tr -d '\r')
+  # The line above pipes COMMENT_BODY, without \r characters, into the loop.
+  # It is important to maintain the loop in the main shell, not a subshell, so
+  # that variables it writes to (SHAKA_BOT_COMMAND and SHAKA_BOT_ARGUMENTS)
+  # affect the caller.
 
   return 1
 }

package/.github/workflows/shaka-bot-commands/main.sh

@@ -42,10 +42,12 @@ if [[ "$SHAKA_BOT_COMMAND" == "" ]]; then
   exit 0
 fi
 
-echo "PR $PR_NUMBER, detected command $SHAKA_BOT_COMMAND"
+echo "PR $PR_NUMBER"
+echo "Detected command \"$SHAKA_BOT_COMMAND\""
+echo "Detected arguments \"$SHAKA_BOT_ARGUMENTS\""
 
 case "$SHAKA_BOT_COMMAND" in
   help) . command-help.sh ;;
   test) . command-test.sh ;;
-  *) echo "Unknown command!" ;;
+  *) echo "Unknown command" ;;
 esac

package/.github/workflows/sync-labels.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: shaka-project/shaka-github-tools
 

package/.github/workflows/talk-to-shaka-bot.yaml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   handle_command:
+    name: Handle Command
     # Only runs on PRs that contain '@shaka-bot' comments, but not comments
     # made by shaka-bot itself, who will sometimes use its own name.
     # Note that contains() is not case sensitive.
@@ -22,7 +23,7 @@ jobs:
       COMMENT_BODY: ${{ github.event.comment.body }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Handle command
         shell: bash

package/.github/workflows/update-issues.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: shaka-project/shaka-github-tools