[Git][reproducible-builds/reproducible-website][master] 2 commits: Limit linter to not scan generated files.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website


Commits:
e5e84247 by Chris Lamb at 2020-04-24T10:41:14+01:00
Limit linter to not scan generated files.

- - - - -
1ab8fa4f by Chris Lamb at 2020-04-24T10:45:37+01:00
Move to use jekyll-redirect-from over manual redirect pages.

- - - - -


9 changed files:

- .gitlab-ci.yml
- Makefile
- _config.yml
- − blog.md
- − donate.md
- − funding.md
- news.md
- − reports.md
- sponsor.md


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1,6 +1,6 @@
 before_script:
   - apt-get -q update
-  - env DEBIAN_FRONTEND=noninteractive apt-get -q -y install jekyll make
+  - env DEBIAN_FRONTEND=noninteractive apt-get -q -y install jekyll make jekyll-redirect-from
 
 test:
   image: debian:stable


=====================================
Makefile
=====================================
@@ -8,10 +8,10 @@ clean:
 
 lint:
 	@for X in $(OLD_LAYOUTS); do \
-		grep -rl "layout: $$X" . | while read Y; do \
+		find -type f -not -wholename '*/_site/*' -print0 | xargs -0r grep -rl "layout: $$X" | while read Y; do \
 			echo "W: $$Y is using legacy layout '$$X'"; \
 		done \
 	done
-	@grep -rl "href=[\"']/" . | while read X; do \
+	@find -type f -not -wholename '*/_site/*' -print0 | xargs -0r grep -rl "href=[\"']/" | while read X; do \
 		echo "W: $$X is using URIs that are not using '{{ \"/foo\" | prepend: site.baseurl }}'"; \
 	done


=====================================
_config.yml
=====================================
@@ -23,6 +23,9 @@ collections:
   reports:
     output: true
 
+plugins:
+  - jekyll-redirect-from
+
 exclude:
 - README
 - .git


=====================================
blog.md deleted
=====================================
@@ -1,4 +0,0 @@
----
-permalink: /blog/
----
-<meta http-equiv="refresh" content="0; url={{ "/reports/" | prepend: site.baseurl }}">


=====================================
donate.md deleted
=====================================
@@ -1,5 +0,0 @@
----
-permalink: /donate/
----
-
-<meta http-equiv="refresh" content="0; url={{ "/sponsor/" | prepend: site.baseurl }}">


=====================================
funding.md deleted
=====================================
@@ -1,5 +0,0 @@
----
-permalink: /funding/
----
-
-<meta http-equiv="refresh" content="0; url={{ "/sponsor/" | prepend: site.baseurl }}">


=====================================
news.md
=====================================
@@ -3,6 +3,9 @@ layout: default
 title: News & reports
 permalink: /news/
 order: 5
+redirect_from:
+ - /reports/
+ - /blog/
 ---
 
 # News


=====================================
reports.md deleted
=====================================
@@ -1,5 +0,0 @@
----
-permalink: /reports/
----
-
-<meta http-equiv="refresh" content="0; url={{ "/news/" | prepend: site.baseurl }}">


=====================================
sponsor.md
=====================================
@@ -2,6 +2,9 @@
 layout: default
 title: Help the Reproducible Builds effort!
 permalink: /sponsor/
+redirect_from:
+ - /funding/
+ - /donate/
 ---
 
 # Help the Reproducible Builds effort!



View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/a543fe5c849e0d6200c7c9a87aa3e5bf5a19e25f...1ab8fa4fec730c43d74d0ba4bfb7a06291032942

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/a543fe5c849e0d6200c7c9a87aa3e5bf5a19e25f...1ab8fa4fec730c43d74d0ba4bfb7a06291032942
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20200424/f467d7cf/attachment.htm>