Skip to content

Commit

Permalink
Merge branch 'release/0.4.3-0'
Browse files Browse the repository at this point in the history
  • Loading branch information
captainyarr committed Sep 1, 2021
2 parents 8bed1b3 + 001f846 commit da26e47
Show file tree
Hide file tree
Showing 28 changed files with 15,241 additions and 14,284 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Expand Up @@ -324,7 +324,6 @@ jobs:


workflows:
version: 2.1
build-and-deploy:
jobs:
- checkout
Expand Down
13 changes: 13 additions & 0 deletions .deepsource.toml
@@ -0,0 +1,13 @@
version = 1

[[analyzers]]
name = "javascript"
enabled = true

[analyzers.meta]
environment = ["nodejs"]
style_guide = "google"

[[transformers]]
name = "prettier"
enabled = true
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"

on:
push:
branches: [develop, master]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
schedule:
- cron: '0 11 * * 4'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
7 changes: 7 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,10 @@
## 0.4.3-0 Beta - Let's All Go To The Movies! - 1 September 2020
New Features:
- Added Experimental section
BugFixes:
- Fix category search
- Various small fixes.

## 0.4.2-0 Beta - Extra Time, Extra Popcorn - 23 August 2020

New Features:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -18,6 +18,8 @@ Want to report a bug, request a feature, contribute or translate Popcorn Time? W

Please don't post pull requests that reformats the code. Please don't remove whitespaces. Don't do any dirty job.

Donate via BTC: 1PSfipNWyDjBFjecgLAaTC1wvocHAVrwhu

## Getting Started

If you're comfortable getting up and running from a `git clone`, this method is for you.
Expand Down
2 changes: 1 addition & 1 deletion install
Expand Up @@ -23,7 +23,7 @@ fi
func_error

#Variables
version="0.4.2-0"
version="0.4.3-0"
tos="https://popcorntime.sh/tos"
$path="$HOME/.Popcorn-Time-CE"

Expand Down

0 comments on commit da26e47

Please sign in to comment.