Cleaning

.gitlab-ci.yml

@@ -14,33 +14,33 @@ stages:
   - install
   - test
   - build
-  - deploy
+#  - deploy
 
-test rules:
-  stage: test
-  script:
-    - jsonlint-php data/data.min.json
-  only:
-    changes:
-      - data/data.min.json
-
-hash rules:
-  stage: build
-  script:
-    - sha256sum data/data.min.json | awk '{print $1}' > rules.min.hash
-    - node build_tools/minifyDataJSON.js "data/data.min.json" "data.minify.json"
-    - sha256sum data.minify.json | awk '{print $1}' > rules.minify.hash
-  artifacts:
-    paths:
-      - rules.min.hash
-      - data.minify.json
-      - rules.minify.hash
-  only:
-    refs:
-      - merge_requests
-      - master
-    changes:
-      - data/data.min.json
+# test rules:
+#   stage: test
+#   script:
+#     - jsonlint-php data/data.min.json
+#   only:
+#     changes:
+#       - data/data.min.json
+# 
+# hash rules:
+#   stage: build
+#   script:
+#     - sha256sum data/data.min.json | awk '{print $1}' > rules.min.hash
+#     - node build_tools/minifyDataJSON.js "data/data.min.json" "data.minify.json"
+#     - sha256sum data.minify.json | awk '{print $1}' > rules.minify.hash
+#   artifacts:
+#     paths:
+#       - rules.min.hash
+#       - data.minify.json
+#       - rules.minify.hash
+#   only:
+#     refs:
+#       - merge_requests
+#       - master
+#     changes:
+#       - data/data.min.json
 
 install dependencies:
     image: node:latest
@@ -83,33 +83,33 @@ test:addon:
 bundle addon:
   stage: build
   script:
-    - zip ClearUrls -r -FS clearurls.js browser-polyfill.js manifest.json img/* external_js/* html/* core_js/* css/* fonts/* _locales/*
+    - zip ClearURLs -r -FS distribution/*
   only:
     - master
   artifacts:
     paths:
-      - ClearUrls.zip
+      - ClearURLs.zip
 
-pages:
-  stage: deploy
-  script:
-    - mkdir public
-    - mkdir public/data
-    - mv GitLabPages/* public/
-    - cp img/clearurls.svg public/clearurls.svg
-    - cp data/data.min.json public/data/data.min.json
-    - sha256sum public/data/data.min.json | awk '{print $1}' > public/data/rules.min.hash
-    - node build_tools/minifyDataJSON.js "public/data/data.min.json" "public/data/data.minify.json"
-    - sha256sum public/data/data.minify.json | awk '{print $1}' > public/data/rules.minify.hash
-  artifacts:
-    paths:
-      - public
-  only:
-    refs:
-      - merge_requests
-      - master
-    changes:
-      - GitLabPages/*
-      - img/clearurls.svg
-      - data/data.min.json
-      - build_tools/minifyDataJSON.js
+# pages:
+#   stage: deploy
+#   script:
+#     - mkdir public
+#     - mkdir public/data
+#     - mv GitLabPages/* public/
+#     - cp img/clearurls.svg public/clearurls.svg
+#     - cp data/data.min.json public/data/data.min.json
+#     - sha256sum public/data/data.min.json | awk '{print $1}' > public/data/rules.min.hash
+#     - node build_tools/minifyDataJSON.js "public/data/data.min.json" "public/data/data.minify.json"
+#     - sha256sum public/data/data.minify.json | awk '{print $1}' > public/data/rules.minify.hash
+#   artifacts:
+#     paths:
+#       - public
+#   only:
+#     refs:
+#       - merge_requests
+#       - master
+#     changes:
+#       - GitLabPages/*
+#       - img/clearurls.svg
+#       - data/data.min.json
+#       - build_tools/minifyDataJSON.js

README.md

@@ -45,7 +45,7 @@ Reasoning for needed permissions can be found under [here](https://gitlab.com/Ke
 ## CI/CD Artifacts Download (for Firefox- and Chrome-Dev only)
 Here you can download the packed files for the Firefox- and Chrome-Dev:
 
-[<img src="promotion/download-128.png"/>](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearUrls.zip?job=bundle%20addon)
+[<img src="promotion/download-128.png"/>](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearURLs.zip?job=bundle%20addon)
 
 ## Test
 If you want to test whether ClearURLs works correctly on your system, you can go to this test page: [https://test.clearurls.xyz/](https://test.clearurls.xyz/)
@@ -64,7 +64,7 @@ You can choose between two options to contribute. You can create a merge request
 It is not necessary to translate the description field; in the most cases it is empty.*
 
 #### Merge request
-If you want to create a merge request, you must open the path [`_locales/en/messages.json`](https://github.com/KevinRoebert/ClearUrls/blob/master/_locales/en/messages.json) in the ClearURLs repo 
+If you want to create a merge request, you must open the path [`source/_locales/en/messages.json`](https://github.com/KevinRoebert/ClearUrls/blob/master/source/_locales/en/messages.json) in the ClearURLs repo 
 and translate the english terms into terms of your language. Once you have translated all the terms, you make a pull request of your translation. 
 Please push your translation into the folder `_locales/{country code}/messages.json`.