mirror of https://github.com/morpheus65535/bazarr
Merge remote-tracking branch 'origin/development' into development
This commit is contained in:
morpheus65535
commit
44338e161f
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"template": "./changelog.hbs",
|
||||
"unreleased": true,
|
||||
"commitLimit": true,
|
||||
"ignoreCommitPattern": "^Release.*",
|
||||
"commitLimit": false,
|
||||
"ignoreCommitPattern": "^(Release|no log:).*",
|
||||
"sortCommits": "date-desc"
|
||||
}
|
||||
|
|
@ -1,12 +1,19 @@
|
|||
name: release_major_and_merge
|
||||
on: workflow_dispatch
|
||||
name: release_dev_to_master
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
increment:
|
||||
description: "Increment Type (major, minor, patch)"
|
||||
required: true
|
||||
default: "patch"
|
||||
|
||||
jobs:
|
||||
Release:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
UI_DIRECTORY: ./frontend
|
||||
ASSET_DIRECTORY: ./__builds__
|
||||
steps:
|
||||
- name: Validate branch
|
||||
if: ${{ github.ref != 'refs/heads/development' }}
|
||||
|
|
@ -20,33 +27,30 @@ jobs:
|
|||
fetch-depth: 0
|
||||
ref: development
|
||||
|
||||
- name: Setup Git
|
||||
run: git config --global user.name "github-actions"
|
||||
|
||||
- name: Setup NodeJS
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: "15.x"
|
||||
- run: npm install -D release-it
|
||||
- run: npm install -D @release-it/bumper
|
||||
- run: npm install -D auto-changelog
|
||||
|
||||
- id: latest_release
|
||||
uses: pozetroninc/github-action-get-latest-release@master
|
||||
with:
|
||||
repository: ${{ github.repository }}
|
||||
excludes: prerelease, draft
|
||||
- name: Install Global Tools
|
||||
run: npm install -g release-it @release-it/bumper auto-changelog
|
||||
|
||||
- name: Define LAST_VERSION environment variable
|
||||
- name: Save UI to Asset
|
||||
run: |
|
||||
echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV
|
||||
mkdir -p ../.${{ env.ASSET_DIRECTORY }} &&
|
||||
zip -r ../.${{ env.ASSET_DIRECTORY }}/ui.zip ./ -x '*.map' -b $(mktemp -d)
|
||||
working-directory: ${{ env.UI_DIRECTORY }}/build
|
||||
|
||||
- name: Update version and create release
|
||||
uses: TheRealWaldo/release-it@v0.2.1
|
||||
with:
|
||||
json-opts: '{"increment": "major"}'
|
||||
- name: Create Release
|
||||
run: release-it --ci --increment ${{ github.event.inputs.increment }}
|
||||
Merge:
|
||||
needs: Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Merge development -> master
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
name: release_minor_and_merge
|
||||
on: workflow_dispatch
|
||||
|
||||
jobs:
|
||||
Release:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
steps:
|
||||
- name: Validate branch
|
||||
if: ${{ github.ref != 'refs/heads/development' }}
|
||||
run: |
|
||||
echo This action can only be run on development branch, not ${{ github.ref }}
|
||||
exit 1
|
||||
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: development
|
||||
|
||||
- name: Setup NodeJS
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: "15.x"
|
||||
- run: npm install -D release-it
|
||||
- run: npm install -D @release-it/bumper
|
||||
- run: npm install -D auto-changelog
|
||||
|
||||
- id: latest_release
|
||||
uses: pozetroninc/github-action-get-latest-release@master
|
||||
with:
|
||||
repository: ${{ github.repository }}
|
||||
excludes: prerelease, draft
|
||||
|
||||
- name: Define LAST_VERSION environment variable
|
||||
run: |
|
||||
echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV
|
||||
|
||||
- name: Update version and create release
|
||||
uses: TheRealWaldo/release-it@v0.2.1
|
||||
with:
|
||||
json-opts: '{"increment": "minor"}'
|
||||
Merge:
|
||||
needs: Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Merge development -> master
|
||||
uses: devmasx/merge-branch@v1.3.1
|
||||
with:
|
||||
type: now
|
||||
from_branch: development
|
||||
target_branch: master
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
name: release_patch_and_merge
|
||||
on: workflow_dispatch
|
||||
|
||||
jobs:
|
||||
Release:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
steps:
|
||||
- name: Validate branch
|
||||
if: ${{ github.ref != 'refs/heads/development' }}
|
||||
run: |
|
||||
echo This action can only be run on development branch, not ${{ github.ref }}
|
||||
exit 1
|
||||
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: development
|
||||
|
||||
- name: Setup NodeJS
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: "15.x"
|
||||
- run: npm install -D release-it
|
||||
- run: npm install -D @release-it/bumper
|
||||
- run: npm install -D auto-changelog
|
||||
|
||||
- id: latest_release
|
||||
uses: pozetroninc/github-action-get-latest-release@master
|
||||
with:
|
||||
repository: ${{ github.repository }}
|
||||
excludes: prerelease, draft
|
||||
|
||||
- name: Define LAST_VERSION environment variable
|
||||
run: |
|
||||
echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV
|
||||
|
||||
- name: Update version and create release
|
||||
uses: TheRealWaldo/release-it@v0.2.1
|
||||
with:
|
||||
json-opts: '{"increment": "patch"}'
|
||||
Merge:
|
||||
needs: Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Merge development -> master
|
||||
uses: devmasx/merge-branch@v1.3.1
|
||||
with:
|
||||
type: now
|
||||
from_branch: development
|
||||
target_branch: master
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
@ -6,7 +6,8 @@
|
|||
},
|
||||
"github": {
|
||||
"release": true,
|
||||
"releaseName": "v${version}"
|
||||
"releaseName": "v${version}",
|
||||
"assets": ["__builds__/*.zip"]
|
||||
},
|
||||
"npm": {
|
||||
"publish": false,
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{
|
||||
"files": {
|
||||
"main.css": "./static/css/main.d2d8be2d.chunk.css",
|
||||
"main.js": "./static/js/main.2f033b86.chunk.js",
|
||||
"main.js.map": "./static/js/main.2f033b86.chunk.js.map",
|
||||
"main.css": "./static/css/main.e5caf7d4.chunk.css",
|
||||
"main.js": "./static/js/main.b1f6d8f0.chunk.js",
|
||||
"main.js.map": "./static/js/main.b1f6d8f0.chunk.js.map",
|
||||
"runtime-main.js": "./static/js/runtime-main.28e08986.js",
|
||||
"runtime-main.js.map": "./static/js/runtime-main.28e08986.js.map",
|
||||
"static/css/2.79026e13.chunk.css": "./static/css/2.79026e13.chunk.css",
|
||||
"static/js/2.9bf2f688.chunk.js": "./static/js/2.9bf2f688.chunk.js",
|
||||
"static/js/2.9bf2f688.chunk.js.map": "./static/js/2.9bf2f688.chunk.js.map",
|
||||
"static/js/2.ce0a71b3.chunk.js": "./static/js/2.ce0a71b3.chunk.js",
|
||||
"static/js/2.ce0a71b3.chunk.js.map": "./static/js/2.ce0a71b3.chunk.js.map",
|
||||
"index.html": "./index.html",
|
||||
"static/css/2.79026e13.chunk.css.map": "./static/css/2.79026e13.chunk.css.map",
|
||||
"static/css/main.d2d8be2d.chunk.css.map": "./static/css/main.d2d8be2d.chunk.css.map",
|
||||
"static/js/2.9bf2f688.chunk.js.LICENSE.txt": "./static/js/2.9bf2f688.chunk.js.LICENSE.txt",
|
||||
"static/css/main.e5caf7d4.chunk.css.map": "./static/css/main.e5caf7d4.chunk.css.map",
|
||||
"static/js/2.ce0a71b3.chunk.js.LICENSE.txt": "./static/js/2.ce0a71b3.chunk.js.LICENSE.txt",
|
||||
"static/media/300.css": "./static/media/roboto-vietnamese-300-normal.54344cce.woff2"
|
||||
},
|
||||
"entrypoints": [
|
||||
"static/js/runtime-main.28e08986.js",
|
||||
"static/css/2.79026e13.chunk.css",
|
||||
"static/js/2.9bf2f688.chunk.js",
|
||||
"static/css/main.d2d8be2d.chunk.css",
|
||||
"static/js/main.2f033b86.chunk.js"
|
||||
"static/js/2.ce0a71b3.chunk.js",
|
||||
"static/css/main.e5caf7d4.chunk.css",
|
||||
"static/js/main.b1f6d8f0.chunk.js"
|
||||
]
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
<!doctype html><html lang="en"><head><title>Bazarr</title><base href="{{baseUrl}}"/><meta charset="utf-8"/><link rel="icon" type="image/x-icon" href="./static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1"/><meta name="description" content="Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you."/><link rel="manifest" href="./static/manifest.json"/><link href="./static/css/2.79026e13.chunk.css" rel="stylesheet"><link href="./static/css/main.d2d8be2d.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>window.Bazarr = {{BAZARR_SERVER_INJECT | tojson | safe}};</script><script>!function(e){function r(r){for(var n,a,l=r[0],f=r[1],i=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="./";var l=this.webpackJsonpbazarr=this.webpackJsonpbazarr||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var i=0;i<l.length;i++)r(l[i]);var p=f;t()}([])</script><script src="./static/js/2.9bf2f688.chunk.js"></script><script src="./static/js/main.2f033b86.chunk.js"></script></body></html>
|
||||
<!doctype html><html lang="en"><head><title>Bazarr</title><base href="{{baseUrl}}"/><meta charset="utf-8"/><link rel="icon" type="image/x-icon" href="./static/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1"/><meta name="description" content="Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you."/><link rel="manifest" href="./static/manifest.json"/><link href="./static/css/2.79026e13.chunk.css" rel="stylesheet"><link href="./static/css/main.e5caf7d4.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>window.Bazarr = {{BAZARR_SERVER_INJECT | tojson | safe}};</script><script>!function(e){function r(r){for(var n,a,l=r[0],f=r[1],i=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="./";var l=this.webpackJsonpbazarr=this.webpackJsonpbazarr||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var i=0;i<l.length;i++)r(l[i]);var p=f;t()}([])</script><script src="./static/js/2.ce0a71b3.chunk.js"></script><script src="./static/js/main.b1f6d8f0.chunk.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue