Skip to content

Commit 04f180c

Browse files
BenJetsonBenJetson
authored
Merge pull request #114 from BenJetson/develop
Merge upgrades to production.
2 parents fd704c1 + c25e176 commit 04f180c

File tree

174 files changed

+5565
-6591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+5565
-6591
lines changed

‎.eclintignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
vendor
2-
node_modules
3-
_site
4-
.sass_cache
5-
_sass/vendor
1+
vendor/**
2+
node_modules/**
3+
_site/**
4+
.sass_cache/**
5+
_sass/vendor/**
66
Gemfile.lock

‎.github/dependabot.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
8+
updates:
9+
- package-ecosystem: bundler
10+
directory: /
11+
schedule:
12+
interval: daily
13+
target-branch: develop
14+
assignees:
15+
- BenJetson
16+
reviewers:
17+
- BenJetson
18+
19+
- package-ecosystem: pip
20+
directory: /scripts
21+
schedule:
22+
interval: daily
23+
target-branch: develop
24+
assignees:
25+
- BenJetson
26+
reviewers:
27+
- BenJetson
28+
29+
- package-ecosystem: docker
30+
directory: /
31+
schedule:
32+
interval: daily
33+
target-branch: develop
34+
assignees:
35+
- BenJetson
36+
reviewers:
37+
- BenJetson

‎.github/workflows/jekyll.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ jobs:
2424
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2525
- uses: actions/checkout@v2
2626

27-
- name: Setup Ruby for use with actions
28-
uses: actions/setup-ruby@v1.0.0
27+
- name: Setup Ruby
28+
uses: ruby/setup-ruby@v1
2929
with:
30-
# Version range or exact version of a Ruby version to use.
31-
version: "2.5" # optional, default is >= 2.4
30+
ruby-version: 2.5
3231

3332
- uses: actions/cache@v1
3433
with:

‎.github/workflows/lint.yml

+29-23
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,14 @@ on:
1818
jobs:
1919
validate:
2020
runs-on: ubuntu-latest
21+
env:
22+
SHCK_VERSION: "v0.7.1"
23+
ECLINT_VERSION: "0.3.2"
24+
ECLINT_GITLAB_UPLOAD_TAG: "38b6bd1c60e02d07b9c8b83ab115ce52"
2125

2226
steps:
2327
- uses: actions/checkout@v2
2428

25-
- name: Node Dependency Cache
26-
uses: actions/cache@v2
27-
with:
28-
path: node_modules
29-
key: ${{ runner.os }}-npm-${{ hashFiles('package.json') }}
30-
- name: Install Node dependencies
31-
run: npm install
32-
- name: Verify Prettier Style
33-
run: npx prettier . --check
34-
- name: Run MarkdownLint
35-
run: npx markdownlint .
36-
- name: Run EditorConfig Lint
37-
run: npx eclint check $(git ls-files | grep -f .eclintignore -v)
38-
3929
- name: Set up Python 3.8
4030
uses: actions/setup-python@v1
4131
with:
@@ -44,17 +34,33 @@ jobs:
4434
uses: actions/cache@v2
4535
with:
4636
path: /opt/hostedtoolcache/Python/3.8.3/x64
47-
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
37+
key: ${{ runner.os }}-pip-${{ hashFiles('scripts/requirements.txt') }}
4838
- name: Install Python dependencies
4939
run: |
5040
python3 -m pip install --upgrade pip
51-
pip3 install -r requirements.txt
52-
- name: Projects Front Matter Validation
53-
run: ./scripts/test_project_frontmatter.py
54-
- name: Verify Black Style
55-
run: black . --check
41+
pip3 install -r scripts/requirements.txt
5642
5743
- name: Install ShellCheck
58-
run: sudo apt install shellcheck
59-
- name: Run ShellCheck
60-
run: shellcheck scripts/*.sh
44+
run: |
45+
set -e;
46+
mkdir -p /tmp/shck_install
47+
cd /tmp/shck_install
48+
wget "https://github.com/koalaman/shellcheck/releases/download/${SHCK_VERSION}/shellcheck-${SHCK_VERSION}.linux.x86_64.tar.xz"
49+
tar --xz -xvf shellcheck-"${SHCK_VERSION}".linux.x86_64.tar.xz
50+
sudo cp shellcheck-"${SHCK_VERSION}"/shellcheck /usr/bin/
51+
shellcheck --version
52+
rm -rf /tmp/shck_install
53+
54+
- name: Install ECLint
55+
run: |
56+
set -e
57+
mkdir -p /tmp/eclint_install
58+
cd /tmp/eclint_install
59+
wget "https://gitlab.com/greut/eclint/uploads/${ECLINT_GITLAB_UPLOAD_TAG}/eclint_${ECLINT_VERSION}_linux_x86_64.tar.gz"
60+
tar -xzvf eclint_"${ECLINT_VERSION}"_linux_x86_64.tar.gz
61+
sudo cp eclint /usr/bin
62+
eclint --version
63+
rm -rf /tmp/eclint_install
64+
65+
- name: Run Linters
66+
run: ./scripts/lint.sh

‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
2-
- repo: https://github.com/prettier/prettier
3-
rev: "2.0.5"
2+
- repo: https://github.com/pre-commit/mirrors-prettier
3+
rev: "v2.3.0"
44
hooks:
55
- id: prettier
66
- repo: https://github.com/psf/black

‎.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ _site
44
.sass_cache
55
_sass/vendor
66
runtime.txt
7+
css/main.scss

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"semi": true,
55
"trailingComma": "es5",
66
"arrowParens": "always",
7-
"endOfLine": "lf"
7+
"endOfLine": "lf",
8+
"proseWrap": "always"
89
}

‎Dockerfile

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
FROM ruby:2.7
2+
3+
VOLUME /mnt/app
4+
VOLUME /mnt/app/vendor
5+
VOLUME /mnt/app/node_modules
6+
7+
RUN mkdir /buildctx
8+
WORKDIR /buildctx
9+
10+
RUN gem install bundler
11+
12+
RUN apt-get update && apt-get install -y \
13+
build-essential \
14+
python3 \
15+
python3-pip \
16+
nodejs \
17+
npm \
18+
;
19+
20+
# Install shellcheck.
21+
ARG SHCK_VERSION="v0.7.1"
22+
RUN set -e; \
23+
mkdir -p /tmp/shck_install \
24+
&& cd /tmp/shck_install \
25+
&& wget "https://github.com/koalaman/shellcheck/releases/download/${SHCK_VERSION}/shellcheck-${SHCK_VERSION}.linux.x86_64.tar.xz" \
26+
&& tar --xz -xvf shellcheck-"${SHCK_VERSION}".linux.x86_64.tar.xz \
27+
&& cp shellcheck-"${SHCK_VERSION}"/shellcheck /usr/bin/ \
28+
&& shellcheck --version \
29+
&& rm -rf /tmp/shck_install
30+
31+
# Install eclint.
32+
ARG ECLINT_VERSION="0.3.2"
33+
ARG ECLINT_GITLAB_UPLOAD_TAG="38b6bd1c60e02d07b9c8b83ab115ce52"
34+
RUN set -e; \
35+
mkdir -p /tmp/eclint_install \
36+
&& cd /tmp/eclint_install \
37+
&& wget "https://gitlab.com/greut/eclint/uploads/${ECLINT_GITLAB_UPLOAD_TAG}/eclint_${ECLINT_VERSION}_linux_x86_64.tar.gz" \
38+
&& tar -xzvf eclint_"${ECLINT_VERSION}"_linux_x86_64.tar.gz \
39+
&& cp eclint /usr/bin \
40+
&& eclint --version \
41+
&& rm -rf /tmp/eclint_install
42+
43+
COPY Gemfile Gemfile.lock ./
44+
RUN bundle install --system
45+
46+
COPY scripts/requirements.txt ./
47+
RUN pip3 install -r requirements.txt
48+
49+
WORKDIR /mnt/app
50+
51+
RUN useradd -m app
52+
USER app

‎Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source "https://rubygems.org"
22

33
gem 'github-pages'
4-
gem 'jekyll-octicons'
54
gem 'jekyll-admin'

0 commit comments

Comments
 (0)