Skip to content

Commit

Permalink
feat(list): global generator enhancement (#32)
Browse files Browse the repository at this point in the history
* feat(list): global generator enhancement
* fix: packages commander
* fix: console logger
* fix: concat external
* fix: github lfs
  • Loading branch information
Ealenn authored Jul 23, 2022
1 parent cba507d commit e15493d
Show file tree
Hide file tree
Showing 48 changed files with 10,603 additions and 1,118 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
[*.{ts,js,json,sh,md}]
[Dockerfile]
charset = utf-8
indent_style = space
indent_size = 2

# Makefile
[Makefile]
indent_style = tab
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/allow_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: ✔️ Allow Report
about: Add domain on AllowList
title: "[ALLOW] ?"
labels: bug
labels: allowlist
assignees: Ealenn

---
Expand All @@ -16,4 +16,4 @@ A clear and concise description.
```

**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/block_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: 🚫 Block Report
about: Add domain on BlockList
title: "[BLOCK] ?"
labels: bug
labels: blocklist
assignees: Ealenn

---
Expand All @@ -16,4 +16,4 @@ A clear and concise description.
```

**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: 🐞​ Bug report
about: Create a report to help us improve
title: "[BUG] Title"
labels: bug
assignees: Ealenn

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Response**
If applicable, add result to help explain your problem.

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: 🚀​ Feature request
about: Suggest an idea for this project
title: "[FEATURE] Title"
labels: enhancement
assignees: Ealenn

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
31 changes: 31 additions & 0 deletions .github/workflows/cli-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: "CLI - NodeJS Tests"

on:
pull_request:
branches: ['*']

jobs:
build:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./modules/guard-cli
strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
with:
path: 'modules/guard-cli'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Install, build, and test
run: |
cd ./modules/guard-cli
npm ci
npm run build
env:
CI: true
29 changes: 0 additions & 29 deletions .github/workflows/dotnet-tests.yml

This file was deleted.

85 changes: 54 additions & 31 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,54 @@
name: Publish

on:
push:
branches:
- "master"
schedule:
- cron: '0 4 * * *'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: '3.1.x'
- name: Install dependencies
run: dotnet restore AdGuard-Home-List.sln
- name: Build
run: dotnet build AdGuard-Home-List.sln --configuration Release --no-restore
- name: Publish
run: dotnet publish --configuration Release --no-build --no-restore --nologo -o publish
- name: Run
run: ./publish/Ealen.AdGuard.App
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
name: Publish

on:
push:
branches:
- "master"
schedule:
- cron: '0 4 * * *'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node
uses: actions/setup-node@v3
with:
node-version: 16
- name: Install & Build
run: |
mkdir public
cd ./modules/guard-cli
npm ci
npm run build
env:
CI: true
- name: Generate AllowList
run: |
node ./modules/guard-cli/dist/main.js generate \
--name AdGuard-Home-List.Allow.txt \
--badge badge-allow.json \
--external ./allowlist/external \
--custom ./allowlist/custom \
--concatExternal ./allowlist/concat \
--convertToAllow \
--output ./public
- name: Generate BlockList
run: |
node ./modules/guard-cli/dist/main.js generate \
--name AdGuard-Home-List.Block.txt \
--badge badge-block.json \
--external ./blocklist/external \
--custom ./blocklist/custom \
--concatExternal ./blocklist/concat \
--output ./public
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
folder: public
clean: true
single-commit: true
force: true
Loading

0 comments on commit e15493d

Please sign in to comment.