From 9381c6d6eb465f7422ed494275bcddd43103199f Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Mon, 5 Jul 2021 12:08:08 +0200
Subject: [PATCH] [GHA] Move Generate Files into Workflow

Ref: #419
---
 .github/workflows/action.yml | 15 +++++++++++++++
 dev-tools/generate-files.sh  | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 963584e98..569fe4dbc 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -40,6 +40,21 @@ jobs:
           ./dev-tools/generate-files.sh
           ./dev-tools/install-nginx-1.sh
 
+      - name: Configure Nginx & Generate Blocker Files - Stage 2
+        shell: bash
+        run: |
+          php ./dev-tools/generate-regex-format-referrers.php
+          php ./dev-tools/generate-regex-format-referrers-whitelist-test.php
+          ./dev-tools/update-bad-ips.sh
+          ./dev-tools/generate-blacklist.sh
+          ./dev-tools/generate-blacklist-testing-of-changes.sh
+          ./dev-tools/modify-config-readme-files.sh
+          ./dev-tools/prepare-robots-input.sh
+          ./dev-tools/generate-robots.sh
+          ./dev-tools/generate-google-disavow.sh
+          php ./dev-tools/generate-google-exclude.php
+          ./dev-tools/generate-files.sh
+          ./dev-tools/install-nginx-1.sh
 
       - name: Test Blocker - Stage 1
         shell: bash
diff --git a/dev-tools/generate-files.sh b/dev-tools/generate-files.sh
index d14c57a1d..24e3101cb 100755
--- a/dev-tools/generate-files.sh
+++ b/dev-tools/generate-files.sh
@@ -69,16 +69,16 @@ sudo chmod +x ./dev-tools/*.php
 
 
 generateFiles () {
-php ./dev-tools/generate-regex-format-referrers.php
-php ./dev-tools/generate-regex-format-referrers-whitelist-test.php
-sudo ./dev-tools/update-bad-ips.sh
-sudo ./dev-tools/generate-blacklist.sh
-sudo ./dev-tools/generate-blacklist-testing-of-changes.sh
-sudo ./dev-tools/modify-config-readme-files.sh
-sudo ./dev-tools/prepare-robots-input.sh
-sudo ./dev-tools/generate-robots.sh
-sudo ./dev-tools/generate-google-disavow.sh
-php ./dev-tools/generate-google-exclude.php
+#php ./dev-tools/generate-regex-format-referrers.php
+#php ./dev-tools/generate-regex-format-referrers-whitelist-test.php
+#sudo ./dev-tools/update-bad-ips.sh
+#sudo ./dev-tools/generate-blacklist.sh
+#sudo ./dev-tools/generate-blacklist-testing-of-changes.sh
+#sudo ./dev-tools/modify-config-readme-files.sh
+#sudo ./dev-tools/prepare-robots-input.sh
+#sudo ./dev-tools/generate-robots.sh
+#sudo ./dev-tools/generate-google-disavow.sh
+#php ./dev-tools/generate-google-exclude.php
 sudo dos2unix ./bots.d/*.conf
 sudo dos2unix ./conf.d/*.conf
 sudo dos2unix ./_generator_lists/*.list