Skip to content

Commit

Permalink
switch to alpha instead of canary and ensure alphas have lower preced…
Browse files Browse the repository at this point in the history
…ense than manual tags

Switching to alpha instead of canary because the semver sorting algorithm is alphabetic and the automated release should always have a lower precendence than manual ones.

Always prefix to the last version even when it's a prerelease so that the ordering is correct, and so that automated alpha releases are able to take precendence over manual ones when new commits are pushed.

Make the prefix `0.alpha` instead of just `alpha` so that it's easy to check if a manual version could be lower than an existing alpha version without dissalowing things like `-rc.0`

See discussion in video-dev#2822
  • Loading branch information
tjenkinson committed Jun 23, 2020
1 parent 82fbefd commit d058edd
Show file tree
Hide file tree
Showing 7 changed files with 239 additions and 75 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
- SAUCE_USERNAME=mangui
stages:
- buildAndTest
- releaseCanary
- releaseAlpha
- release
- testFuncRequired
- testFuncOptional
Expand All @@ -39,10 +39,10 @@ jobs:
skip_cleanup: true
on:
tags: true
# publish canary package (and deploy gh-pages) if on master
- stage: releaseCanary
# publish canary package if on master
- stage: releaseAlpha
if: branch = master AND type != pull_request
env: TRAVIS_MODE=releaseCanary
env: TRAVIS_MODE=releaseAlpha
# Required tests
- stage: buildAndTest
env: TRAVIS_MODE=build
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://api.travis-ci.org/video-dev/hls.js.svg?branch=master)](https://travis-ci.org/video-dev/hls.js)
[![npm](https://img.shields.io/npm/v/hls.js.svg?style=flat)](https://npmjs.org/package/hls.js)
[![npm](https://img.shields.io/npm/v/hls.js/canary.svg?style=flat)](https://www.npmjs.com/package/hls.js/v/canary)
[![npm](https://img.shields.io/npm/v/hls.js/alpha.svg?style=flat)](https://www.npmjs.com/package/hls.js/v/alpha)
[![](https://data.jsdelivr.com/v1/package/npm/hls.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/hls.js)

[![](https://www.netlify.com/img/global/badges/netlify-color-accent.svg)](https://www.netlify.com)
Expand Down Expand Up @@ -58,8 +58,8 @@ Find the commit on [https://github.com/video-dev/hls.js/blob/deployments/README.

```html
<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
<!-- Or if you want a more recent canary version -->
<!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@canary"></script> -->
<!-- Or if you want a more recent alpha version -->
<!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@alpha"></script> -->
<video id="video"></video>
<script>
var video = document.getElementById('video');
Expand Down Expand Up @@ -147,9 +147,9 @@ If you want to bundle the application yourself, use node
```
npm install hls.js
```
or for the version from master (canary)
or for the version from master (alpha)
```
npm install hls.js@canary
npm install hls.js@alpha
```

**NOTE:** `hls.light.*.js` dist files do not include subtitling and alternate-audio features.
Expand Down
Loading

0 comments on commit d058edd

Please sign in to comment.