about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorManeraKai <manerakai@protonmail.com>2022-07-17 08:07:25 +0200
committerManeraKai <manerakai@protonmail.com>2022-07-17 08:07:25 +0200
commitc1802f2670bb3046523ca8c175673b7a55e1175d (patch)
tree2bbfc5a4d290b34a893c08aae0240b1efdb5dc11
parentFixed conflicts (diff)
parentdata and blacklist only handled by ci (diff)
downloadlibredirect-c1802f2670bb3046523ca8c175673b7a55e1175d.zip
Merge pull request 'data and blacklist only handled by ci' (#7) from BobIsMyManager/libredirect:master into master
Reviewed-on: https://codeberg.org/LibRedirect/libredirect/pulls/7
-rw-r--r--.github/workflows/main.yml3
-rw-r--r--.gitignore4
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d746e28..4ff79267 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,8 +29,7 @@ jobs:
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git add -A
-          git commit -m "update instances" -a || :
+          git commit -Am "update instances" || :
       - name: push changes
         uses: ad-m/github-push-action@v0.6.0
         with:
diff --git a/.gitignore b/.gitignore
index a50c6bde..76962127 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@ web-ext-artifacts/
 .DS_Store
 nod
 node_modules
-package-lock.json
\ No newline at end of file
+package-lock.json
+src/instances/blacklist.json
+src/instances/data.json