From: gap579137 <gap579137@gmail.com>
Date: Fri, 11 Jun 2021 13:19:52 +0000 (-0500)
Subject: Combine automation
X-Git-Tag: aggregated-20250518~572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b61fb63a914474b518d2a3cee0d0f036bf5a8db;p=thirdparty%2Fblocklistproject%2Flists.git

Combine automation
---

diff --git a/.github/workflows/generate-noip.yml b/.github/workflows/generate-noip.yml
deleted file mode 100644
index 80a129a..0000000
--- a/.github/workflows/generate-noip.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 15.x
-      - run: node scripts/generate-noip.js
-      - name: Commit & Push
-        uses: actions-x/commit@v2
-        with:
-          email: noreply@blocklist.site
-          name: GitHub Actions
-          branch: master
-
diff --git a/.github/workflows/generate-dnsmasq.yml b/.github/workflows/run-automations.yml
similarity index 91%
rename from .github/workflows/generate-dnsmasq.yml
rename to .github/workflows/run-automations.yml
index 1f5af7f..df32e0b 100644
--- a/.github/workflows/generate-dnsmasq.yml
+++ b/.github/workflows/run-automations.yml
@@ -13,6 +13,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 15.x
+      - run: node scripts/generate-noip.js
       - run: node scripts/generate-dnsmasq.js
       - name: Commit & Push
         uses: actions-x/commit@v2
@@ -20,4 +21,3 @@ jobs:
           email: noreply@blocklist.site
           name: GitHub Actions
           branch: master
-