mirror of https://github.com/morpheus65535/bazarr
Merge remote-tracking branch 'origin/development' into development
This commit is contained in:
commit
0651b8fb8b
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"template": "./changelog.hbs",
|
||||||
|
"unreleased": true,
|
||||||
|
"commitLimit": true,
|
||||||
|
"ignoreCommitPattern": "^Release.*",
|
||||||
|
"sortCommits": "date-desc"
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: 'npm'
|
||||||
|
directory: '/frontend'
|
||||||
|
schedule:
|
||||||
|
interval: 'weekly'
|
||||||
|
commit-message:
|
||||||
|
prefix: "[bot]"
|
||||||
|
open-pull-requests-limit: 1
|
||||||
|
target-branch: "development"
|
|
@ -2,33 +2,41 @@ name: CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [frontend-upgrade]
|
branches: [development]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [frontend-upgrade]
|
branches: [development]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Frontend:
|
Frontend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
working-directory: ./frontend
|
UI_DIRECTORY: ./frontend
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
node-version: [14.x]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Node.js ${{ matrix.node-version }}
|
- name: Cache node_modules
|
||||||
uses: actions/setup-node@v1
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
path: '${{ env.UI_DIRECTORY }}/node_modules'
|
||||||
|
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
|
||||||
|
restore-keys: ${{ runner.os }}-modules-
|
||||||
|
|
||||||
|
- name: Setup NodeJS
|
||||||
|
uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: "15.x"
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm install
|
run: npm install
|
||||||
working-directory: ${{ env.working-directory }}
|
working-directory: ${{ env.UI_DIRECTORY }}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: npm run build
|
run: npm run build
|
||||||
working-directory: ${{ env.working-directory }}
|
working-directory: ${{ env.UI_DIRECTORY }}
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: "ui"
|
||||||
|
path: "${{ env.UI_DIRECTORY }}/build"
|
||||||
|
|
|
@ -1,55 +1,47 @@
|
||||||
name: release_beta_to_dev
|
name: release_beta_to_dev
|
||||||
on:
|
on: workflow_dispatch
|
||||||
push:
|
|
||||||
branches: [development]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Release:
|
Release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
|
||||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
working-directory: ./frontend
|
UI_DIRECTORY: ./frontend
|
||||||
|
FETCH_DEPTH: 15 # Should be enough
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source code
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: ${{ env.FETCH_DEPTH }}
|
||||||
ref: development
|
ref: development
|
||||||
|
|
||||||
|
- name: Setup Git
|
||||||
|
run: |
|
||||||
|
git config --global user.name "github-actions" &&
|
||||||
|
git fetch --depth ${{ env.FETCH_DEPTH }} --tags
|
||||||
|
|
||||||
|
- name: Cache node_modules
|
||||||
|
uses: actions/cache@v2
|
||||||
|
with:
|
||||||
|
path: '${{ env.UI_DIRECTORY }}/node_modules'
|
||||||
|
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
|
||||||
|
restore-keys: ${{ runner.os }}-modules-
|
||||||
|
|
||||||
- name: Setup NodeJS
|
- name: Setup NodeJS
|
||||||
uses: actions/setup-node@v2
|
uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: "15.x"
|
node-version: "15.x"
|
||||||
- run: npm install -D release-it
|
|
||||||
- run: npm install -D @release-it/bumper
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install Global Tools
|
||||||
run: npm --prefix ${{ env.working-directory }} install
|
run: npm install -g release-it @release-it/bumper auto-changelog
|
||||||
|
|
||||||
- name: Remove previous build directory
|
- name: Install UI Dependencies
|
||||||
uses: JesseTG/rm@v1.0.2
|
run: npm install
|
||||||
with:
|
working-directory: ${{ env.UI_DIRECTORY }}
|
||||||
path: ${{ env.working-directory }}/build
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build & Stage UI
|
||||||
run: npm --prefix ${{ env.working-directory }} run build
|
run: npm run build && git add .
|
||||||
|
working-directory: ${{ env.UI_DIRECTORY }}
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v4
|
- name: Create Release
|
||||||
with:
|
run: release-it --ci --increment prerelease --preRelease=beta
|
||||||
commit_message: Release commit build
|
|
||||||
|
|
||||||
- id: latest_release
|
|
||||||
uses: pozetroninc/github-action-get-latest-release@master
|
|
||||||
with:
|
|
||||||
repository: ${{ github.repository }}
|
|
||||||
excludes: 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: '{"preRelease": true, "increment": "prepatch", "preReleaseId": "beta"}'
|
|
||||||
|
|
|
@ -11,6 +11,9 @@ bazarr.pid
|
||||||
/bin
|
/bin
|
||||||
/.vscode
|
/.vscode
|
||||||
|
|
||||||
|
/package.json
|
||||||
|
/package-lock.json
|
||||||
|
|
||||||
# Allow
|
# Allow
|
||||||
!*.dll
|
!*.dll
|
||||||
|
|
||||||
|
@ -20,3 +23,4 @@ frontend/dist
|
||||||
frontend/*.local
|
frontend/*.local
|
||||||
frontend/.eslintcache
|
frontend/.eslintcache
|
||||||
frontend/.idea/*
|
frontend/.idea/*
|
||||||
|
frontend/**/*.map
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{
|
{
|
||||||
|
"git": {
|
||||||
|
"requireCleanWorkingDir": false,
|
||||||
|
"changelog": "auto-changelog --stdout"
|
||||||
|
},
|
||||||
"github": {
|
"github": {
|
||||||
"release": true,
|
"release": true,
|
||||||
"releaseName": "v${version}",
|
"releaseName": "v${version}"
|
||||||
"releaseNotes": "echo \"From newest to oldest:\" && git log --pretty=format:\"- %s [%h](${repo.protocol}://${repo.host}/${repo.owner}/${repo.project}/commit/%H)\" --no-merges --grep \"^Release\" --invert-grep $LAST_VERSION..HEAD"
|
|
||||||
},
|
},
|
||||||
"npm": {
|
"npm": {
|
||||||
"publish": false,
|
"publish": false,
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
From newest to oldest:
|
From newest to oldest:
|
||||||
{{#each releases}}
|
{{#each releases}}
|
||||||
{{#each commits}}
|
{{#if @first}}
|
||||||
- {{subject}}{{#if href}} [`{{shorthash}}`]({{href}}){{/if}}
|
{{#each commits}}
|
||||||
{{/each}}
|
- {{subject}}{{#if href}} [{{shorthash}}]({{href}}){{/if}}
|
||||||
|
{{/each}}
|
||||||
|
{{/if}}
|
||||||
{{/each}}
|
{{/each}}
|
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 it is too large
Load Diff
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"devDependencies": {
|
|
||||||
"@release-it/bumper": "^2.0.0",
|
|
||||||
"release-it": "^14.5.0"
|
|
||||||
},
|
|
||||||
"version": "0.9.4-beta.7"
|
|
||||||
}
|
|
Loading…
Reference in New Issue