Skip to content

Commit

Permalink
Merge branch 'release/0.1.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Apr 21, 2022
2 parents 66a68f5 + 620d0b6 commit 2b0acb7
Showing 20 changed files with 594 additions and 540 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.6
current_version = 0.1.7
tag_name = {new_version}
commit = True
tag = True
26 changes: 19 additions & 7 deletions .gitchangelog.rc
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
##
## Description
##
## ACTION is one of '[REF]', '[FIX]', '[ADD]'
## ACTION is one of '[REF]', '[FIX]', '[ADD]', '[DEL]'
##
## Is WHAT the change is about.
##
@@ -41,6 +41,17 @@
ignore_regexps = [
r'^(.{3,3}\s*:)?\s*[Uu]pdating [Cc]hangelog and [Vv]ersion.?\s*$',
r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
r'@minor', r'!minor',
r'@cosmetic', r'!cosmetic',
r'@refactor', r'!refactor',
r'@wip', r'!wip',
r'^[Cc][Ii]\s*:', ## ignore Ci-related commits
r'^.*:\s*[Cc][Ii]\s*:', ## ignore Ci-related commits
r'^.*[Cc]ircle[Cc][Ii]\s*', ## ignore Ci-related commits
r'^.*:github:.*$',
r'^.*:changelog:.*$',
r'^Git-svn-id',
r'^$', ## ignore commits with empty messages
]


@@ -57,9 +68,10 @@ ignore_regexps = [
## whenever you are tweaking this variable.
##
section_regexps = [
('New', [r'^\[ADD\]\s*([^\n]*)$']),
('Changes', [r'^\[REF\]\s*([^\n]*)$']),
('Fix', [r'^\[FIX\]\s*([^\n]*)$']),
('Added', [r'^\[ADD\]\s*([^\n]*)$']),
('Changed', [r'^\[REF\]\s*([^\n]*)$']),
('Fixed', [r'^\[FIX\]\s*([^\n]*)$']),
('Removed', [r'^\[DEL\]\s*([^\n]*)$']),
('Other', None),
]

@@ -120,7 +132,7 @@ tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$'
##
## This label will be used as the changelog Title of the last set of changes
## between last valid tag and HEAD if any.
unreleased_version_label = "%%version%% (unreleased)"
unreleased_version_label = "(unreleased)"


## ``output_engine`` is a callable
@@ -153,8 +165,8 @@ unreleased_version_label = "%%version%% (unreleased)"
##
#output_engine = rest_py
#output_engine = mustache("restructuredtext")
output_engine = mustache("markdown")
#output_engine = makotemplate("restructuredtext")
#output_engine = mustache("markdown")
output_engine = makotemplate(".gitchangelog.tpl")


## ``include_merge`` is a boolean
21 changes: 21 additions & 0 deletions .gitchangelog.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
% if data["title"]:
# ${data["title"]}
% endif

% for version in data["versions"]:

<% title = "## %s (%s)" % (version["tag"], version["date"]) if version["tag"] else "## %s" % opts["unreleased_version_label"] %>${title}
% for section in version["sections"]:

<% lbl = "### %s" % section["label"] %>${lbl}

% for commit in section["commits"]:
<%
author = commit["author"].replace('_', '\_')
subject = "%s [%s]" % (commit["subject"], author)
entry = indent(subject, first=" * ").strip()
%>${entry}

% endfor
% endfor
% endfor
2 changes: 0 additions & 2 deletions .github/FUNDING.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -7,6 +7,13 @@ updates:
day: monday
time: "01:00"
open-pull-requests-limit: 99
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
day: monday
time: "01:00"
open-pull-requests-limit: 99
- package-ecosystem: docker
directory: "/"
schedule:
39 changes: 5 additions & 34 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -2,51 +2,22 @@ name: Code Quality

on:
schedule:
- cron: '00 3 * * 1'
- cron: '00 6 * * 1'

jobs:
build:
name: Build
name: Generating code quality report
runs-on: ubuntu-20.04
if: github.repository == 'LuisAlejandro/movie-box'
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: develop
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: javascript
config-file: ./.github/codeql-config.yml
- name: Restoring node_modules cache
uses: actions/cache@v2
with:
path: 'node_modules'
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
- name: Login to Github Docker Registry
run: echo ${{ secrets.PERSONAL_ACCESS_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_ACTOR --password-stdin
- name: Pulling docker cache
run: |
GITHUB_REPOSITORY=$(echo $GITHUB_REPOSITORY | tr '[A-Z]' '[a-z]')
docker pull docker.pkg.github.com/$GITHUB_REPOSITORY/moviebox-build-cache || true
- name: Building image with cache
run: |
GITHUB_REPOSITORY=$(echo $GITHUB_REPOSITORY | tr '[A-Z]' '[a-z]')
docker build . -t luisalejandro/movie-box:latest --cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/moviebox-build-cache
- name: Building project
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GIST_ID: ${{ secrets.GIST_ID }}
TRAKT_ID: ${{ secrets.TRAKT_ID }}
TRAKT_USERNAME: ${{ secrets.TRAKT_USERNAME }}
MOVIE_BOX_MODE: ${{ secrets.MOVIE_BOX_MODE }}
run: |
echo "GH_TOKEN=${GH_TOKEN}" > .env
echo "GIST_ID=${GIST_ID}" >> .env
echo "TRAKT_ID=${TRAKT_ID}" >> .env
echo "TRAKT_USERNAME=${TRAKT_USERNAME}" >> .env
echo "MOVIE_BOX_MODE=${MOVIE_BOX_MODE}" >> .env
sudo chown -R 1000:1000 .
make image dependencies update
sudo chown -R runner:docker .
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
18 changes: 10 additions & 8 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -17,9 +17,11 @@ jobs:
if: github.repository == 'LuisAlejandro/movie-box'
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: develop
- name: Restoring node_modules cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: 'node_modules'
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
@@ -62,12 +64,12 @@ jobs:
needs: build
steps:
- name: Approve
uses: hmarr/auto-approve-action@v2.0.0
uses: hmarr/auto-approve-action@v2.2.1
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
- name: Approve
uses: hmarr/auto-approve-action@v2.0.0
uses: hmarr/auto-approve-action@v2.2.1
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -79,23 +81,23 @@ jobs:
needs: approve
steps:
- name: Merge
uses: actions/github-script@v3
uses: actions/github-script@v6
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
script: |
await github.pulls.merge({
await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
})
- name: Merge
uses: actions/github-script@v3
uses: actions/github-script@v6
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
script: |
await github.pulls.merge({
await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2
- name: Restoring node_modules cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: 'node_modules'
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
8 changes: 5 additions & 3 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
@@ -11,11 +11,13 @@ jobs:
name: Updating movie-box gist
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Checkout repo
uses: actions/checkout@v2
with:
ref: master
- run: npm install
- name: Update
- name: Installing dependencies
run: npm install
- name: Executing movie-box action
uses: ./
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
9 changes: 9 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Authors

## Development Lead

* Luis Alejandro Martínez Faneyth <luis@collagelabs.org>

## Contributors

None yet. Why not be the first?
15 changes: 15 additions & 0 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Contributor License Agreement Version 1.0

Copyright (C) 2020-2022, Movie Box Developers.

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

By making a contribution to this project, I certify that:

a. The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or

b. The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or

c. The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.

d. I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
FROM dockershelf/node:12
LABEL maintainer "Luis Alejandro Martínez Faneyth <luis@luisalejandro.org>"
FROM dockershelf/node:14
LABEL maintainer "Luis Alejandro Martínez Faneyth <luis@collagelabs.org>"

RUN apt-get update && \
apt-get install gnupg sudo
apt-get install gnupg dirmngr sudo

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN dirmngr --debug-level guru

RUN gpg --lock-never --no-default-keyring \
--keyring /usr/share/keyrings/yarn.gpg \
--keyserver hkp://keyserver.ubuntu.com:80 \
--recv-keys 23E7166788B63E1E
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN apt-get update && \
apt-get install yarn
Loading

0 comments on commit 2b0acb7

Please sign in to comment.