Skip to content

Commit

Permalink
**Release 108**
Browse files Browse the repository at this point in the history
commit 3fae2ef
Author: Emma <[email protected]>
Date:   Fri Oct 20 17:18:17 2023 -0400
    Add script for pushing to release branch
    This was previously a python script in a separate repo. Now, it is in the `_scripts/` folder and is in javascript.

commit 4bdfe84
Author: Emma <[email protected]>
Date:   Fri Oct 20 15:17:16 2023 -0400
    Increase end margin of flexBox on mobile
    in order to make the "Fetch more results" button not overflow off the bottom of the page.

commit e780abf
Merge: d3ad30a b55ad5d
Author: Emma <[email protected]>
Date:   Fri Oct 20 15:15:44 2023 -0400
    Merge remote-tracking branch 'upstream/development' into development

...

**Full Changelog**: 0.18.0.107...0.19.1.108
  • Loading branch information
MarmadileManteater committed Oct 20, 2023
2 parents 54a4035 + 3fae2ef commit d875ec1
Show file tree
Hide file tree
Showing 404 changed files with 28,407 additions and 33,334 deletions.
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.gitignore
.prettierrc
Dockerfile
LICENSE
README.md
12 changes: 11 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,19 @@ module.exports = {
{
files: ['*.json'],
parser: 'jsonc-eslint-parser',
extends: ['plugin:jsonc/base'],
rules: {
'no-tabs': 'off',
'comma-spacing': 'off'
}
},
{
files: ['*.yaml', '*.yml'],
parser: 'yaml-eslint-parser',
extends: ['plugin:yml/recommended'],
rules: {
'yml/no-irregular-whitespace': 'off'
}
}
],

Expand All @@ -39,7 +48,7 @@ module.exports = {
'plugin:vue/recommended',
'standard',
'plugin:jsonc/recommended-with-json',
// 'plugin:vuejs-accessibility/recommended' // uncomment once issues are fixed
'plugin:vuejs-accessibility/recommended'
],

// https://eslint.org/docs/user-guide/configuring#configuring-plugins
Expand All @@ -62,6 +71,7 @@ module.exports = {
some: ['nesting', 'id']
}
}],
'vuejs-accessibility/no-static-element-interactions': 'off',
'n/no-callback-literal': 'warn',
'n/no-path-concat': 'warn',
'unicorn/better-regex': 'error',
Expand Down
23 changes: 22 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,28 @@ updates:
labels:
- "PR: waiting for review"
- "PR: dependencies"
open-pull-requests-limit: 10
open-pull-requests-limit: 15
groups:
babel:
patterns:
- "@babel/*"
- "babel-*"
eslint:
patterns:
- "eslint"
- "eslint-*"
- "yaml-eslint-parser"
- "vue-eslint-parser"
stylelint:
patterns:
- "stylelint"
- "stylelint-*"
- "postcss"
- "postcss-*"
- "@double-great/stylelint-a11y"
fortawesome:
patterns:
- "@fortawesome/*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
65 changes: 65 additions & 0 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
'B: visual':
- '(visual bug)'

'B: Unofficial Download':
- '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(Android, FreeTubeCordova Unofficial\)|PortableApps \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))'

'B: keyboard control':
- '(keyboard control not working)'

'B: text/string':
- '(text/string issue)'

'B: content not loading':
- '(content not loading)'

'B: accessibility':
- '(accessibility issue)'

'B: usability':
- '(usability issue)'

'B: crash':
- '(causes crash)'

'B: feature stopped working':
- '(feature stopped working)'

'B: inconsistent behavior':
- '(inconsistent behavior)'

'B: data loss':
- '(data loss)'

'B: race condition':
- '(race condition)'

'B: API issue':
- '(API issue)'

'B: developer mode':
- '(only happens in developer mode)'

'E: improvement existing feature':
- '(improvement to existing feature)'

'E: new optional setting':
- '(new optional setting)'

'E: visual improvement':
- '(visual improvement)'

'E: display more information':
- '(display more information to user)'

'E: ease of use improvement':
- '(ease of use improvement)'

'E: support external software':
- '(support for external software)'

'E: new feature':
- '(new feature)'

'E: keyboard shortcut':
- '(new keyboard shortcut)'
File renamed without changes.
104 changes: 0 additions & 104 deletions .github/workflows/autoLabelIssue.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/autoMerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

steps:
- name: Auto Merge PR
if: github.event.pull_request.draft == false && (contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC'))
if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
run: |
echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
gh auth login --with-token < auth.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/buildCordova.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ jobs:
- name: 📦 Pack for 🕸web with Node.js
run: yarn pack:web

- name: 🐋 Build docker image
run: |
docker build -t ghcr.io/marmadilemanteater/freetubecordova-nightly:${{ steps.versionNumber.outputs.result }} .
docker build -t ghcr.io/marmadilemanteater/freetubecordova-nightly:latest .
- name: 🗝 Login to Github Container Registry
run: |
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u MarmadileManteater --password-stdin
- name: 📡 Push docker image to Github Container Registry
run: |
docker push ghcr.io/marmadilemanteater/freetubecordova-nightly:${{ steps.versionNumber.outputs.result }}
docker push ghcr.io/marmadilemanteater/freetubecordova-nightly:latest
- name: 📡 Upload PWA Artifact
uses: actions/upload-artifact@v3
with:
Expand All @@ -78,6 +92,11 @@ jobs:
- name: 🚧 Setup Android SDK Tools
uses: android-actions/[email protected]

- name: ⬇ Download dependency `cordova-plugin-run-in-background`
run: |
git clone https://bitbucket.org/TheBosZ/cordova-plugin-run-in-background.git
sed -i 's@git+https://bitbucket.org/TheBosZ/cordova-plugin-run-in-background.git@../../cordova-plugin-run-in-background@g' ./src/cordova/package.js
- name: 📦 Pack for 📱Android with Node.js & Cordova
run: yarn pack:cordova

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/calibreapp-image-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compress Images
id: calibre
uses: calibreapp/image-actions@main
Expand All @@ -20,7 +20,7 @@ jobs:
compressOnly: true
- name: Create New Pull Request If Needed
if: steps.calibre.outputs.markdown != ''
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
title: Compressed Images Nightly
branch-suffix: timestamp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: flathub/io.freetubeapp.FreeTube
token: ${{ secrets.FLATHUB_TOKEN }}
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/label-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: "Issue Labeler"
on:
issues:
types: [opened]

permissions:
issues: write
contents: read

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/[email protected]
with:
configuration-path: .github/issue-labeler.yml
enable-versioned-regex: 0
repo-token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ jobs:
- uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/pr-labeler.yml
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
Loading

0 comments on commit d875ec1

Please sign in to comment.