Skip to content

Commit

Permalink
Merge branch 'shaka-project:main' into cea708-multiple-windows
Browse files Browse the repository at this point in the history
  • Loading branch information
darrinliam authored Jan 19, 2025
2 parents 09ab58e + 2911f81 commit a7fe857
Show file tree
Hide file tree
Showing 144 changed files with 1,733 additions and 936 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

312 changes: 0 additions & 312 deletions .eslintrc.js

This file was deleted.

1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.sh text eol=lf
*.py text eol=lf
*.js text eol=lf
*.mjs text eol=lf
15 changes: 7 additions & 8 deletions .github/workflows/demo-version-index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ name: Deploy Demo Version Index
on:
workflow_dispatch:
# Allows for manual triggering.
workflow_call:
# Allows calling this from another workflow with "uses:".
# The release workflow will trigger this as a final step after updating the
# appspot deployment.
secrets:
APPENGINE_DEPLOY_KEY:
required: true
push:
branches:
- main
paths:
- .github/workflows/demo-version-index.yaml
- app-engine/demo-version-index/**
release:
types: [published]
# NOTE: So long as releases are made without a personal access token (PAT),
# they will not activate this workflow's release trigger. For now, the
# schedule trigger will compensate for that by updating the index nightly.
schedule:
# Run every night at 10pm PST / 6am UTC.
- cron: '0 6 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/nightly-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ jobs:
node-version: 22
registry-url: 'https://registry.npmjs.org'

# The nightly demo has its own receiver app ID that points to the nightly
# demo itself for the receiver side.
- name: Override Cast Receiver App ID
run: |
sed \
-i demo/index.html \
-e 's/\(data-shaka-player-cast-receiver-id\)="[^"]*"/\1="07AEE832"/'
- uses: ./.github/workflows/custom-actions/prep-for-appspot

- uses: google-github-actions/auth@v2
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release-please.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,10 @@ jobs:
TAG=${{ needs.release.outputs.tag_name }}
BRANCH=$(echo "$TAG" | sed -e 's/\.0$/.x/')
git push origin refs/tags/"$TAG"^{commit}:refs/heads/"$BRANCH"
update-demo-index:
name: Deploy Demo Version Index
needs: [appspot]
uses: ./.github/workflows/demo-version-index.yaml
secrets:
APPENGINE_DEPLOY_KEY: '${{ secrets.APPENGINE_DEPLOY_KEY }}'
4 changes: 2 additions & 2 deletions build/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_lint_files():
get('build'))
main_sources.remove(os.path.join(base, 'build', 'wrapper.template.js'))
tool_sources = [
os.path.join(base, '.eslintrc.js'),
os.path.join(base, 'eslint.config.mjs'),
os.path.join(base, 'docs', 'jsdoc-plugin.js'),
os.path.join(base, 'karma.conf.js'),
]
Expand All @@ -82,7 +82,7 @@ def check_js_lint(args):
logging.info('Linting JavaScript...')

base = shakaBuildHelpers.get_source_base()
config_path = os.path.join(base, '.eslintrc.js')
config_path = os.path.join(base, 'eslint.config.mjs')

linter = compiler.Linter(get_lint_files(), config_path)
return linter.lint(fix=args.fix, force=args.force)
Expand Down
Loading

0 comments on commit a7fe857

Please sign in to comment.