Skip to content

Commit 43516a0

Browse files
authored
fixes: #14 (#15)
1 parent 2a7694c commit 43516a0

File tree

8 files changed

+53
-38
lines changed

8 files changed

+53
-38
lines changed

.github/workflows/deploy-theme.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
with:
2323
api-url: ${{ secrets.GHOST_API_URL }}
2424
api-key: ${{ secrets.GHOST_ADMIN_API_KEY }}
25-
exclude: "node_modules gulpfile.js yarn.lock .gitignore .github .git LICENSE README.md .pre-commit-config.yaml routes.yaml tailwind.config.js"
25+
exclude: "node_modules gulpfile.js yarn.lock .gitignore .github .git LICENSE README.md .pre-commit-config.yaml routes.yaml tailwind.config.js .nvmrc "
2626

.github/workflows/tests-pr.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
name: tests-pr
55

66
on:
7+
workflow_dispatch:
78
pull_request:
89
branches: [ "main" ]
9-
workflow_dispatch:
1010

1111
permissions:
1212
contents: read
1313

1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
17+
1718
strategy:
1819
fail-fast: true
1920
matrix:
@@ -22,8 +23,7 @@ jobs:
2223
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2324

2425
steps:
25-
-
26-
name: Harden Runner
26+
- name: Harden Runner
2727
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
2828
with:
2929
egress-policy: audit
@@ -40,10 +40,16 @@ jobs:
4040
cache-dependency-path: ./yarn.lock
4141

4242
- name: Install and test with ${{ matrix.node-version }}
43+
continue-on-error: true
44+
id: install
4345
run: |
44-
npm install -g gscan
4546
yarn install
4647
yarn build
47-
yarn test
48-
yarn test:ci
48+
yarn run test:dev
4949
50+
- name: Install if previous step failed
51+
if: steps.install.outcome == 'failure'
52+
run: |
53+
yarn install
54+
yarn build
55+
npx gscan . --verbose

.github/workflows/tests.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
workflow_dispatch:
88
push:
99
branches: [ "main" ]
10-
workflow_call:
1110

1211
permissions:
1312
contents: read
@@ -42,8 +41,7 @@ jobs:
4241

4342
- name: Install and test with ${{ matrix.node-version }}
4443
run: |
45-
npm install -g gscan
44+
yarn add gscan || npm install -g gscan
4645
yarn install
4746
yarn build
48-
yarn test:ci || yarn test
49-
47+
yarn test:ci

assets/built/prism.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/screen.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/prism.js

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const {series, watch, src, dest, parallel} = require('gulp');
22
const pump = require('pump');
33
const tailwind = require("tailwindcss");
4-
const concat = require('gulp-concat');
4+
// const concat = require('gulp-concat');
55

66
// gulp plugins and utils
77
const livereload = require('gulp-livereload');
@@ -63,38 +63,16 @@ function js(done) {
6363
], handleError(done));
6464
}
6565

66-
function prism(done) {
67-
pump([
68-
src([
69-
// pull in lib files first so our own code can depend on it
70-
"node_modules/prismjs/prism.js",
71-
"node_modules/prismjs/components/prism-*.min.js",
72-
"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.min.js",
73-
"node_modules/prismjs/plugins/toolbar/prism-toolbar.min.js",
74-
"node_modules/prismjs/plugins/show-language/prism-show-language.min.js",
75-
"node_modules/prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard.min.js"
76-
], { sourcemaps: false }),
77-
concat('prism.js'),
78-
uglify(),
79-
dest("assets/built/", { sourcemaps: "." }),
80-
livereload(),
81-
],
82-
handleError(done)
83-
);
84-
}
85-
8666

8767
const cssWatcher = () => watch('assets/css/**', css);
8868
const jsWatcher = () => watch('assets/js/**', js);
8969
const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs'], hbs);
90-
const prismWatcher = () => watch('gulpfile.js', prism);
9170
const watcher = parallel(
9271
cssWatcher,
9372
jsWatcher,
94-
prismWatcher,
9573
hbsWatcher
9674
);
97-
const build = series(css, js, prism);
75+
const build = series(css, js);
9876

9977
exports.build = build;
10078
exports.default = series(build, serve, watcher);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sredevopsorg-ghost-theme",
33
"description": "Ghost v5 Theme made for SREDevOps.org (https://sredevops.org) based on Tailwind CSS v3, responsive, dark color schema, SVG icons, sidebar + footer navgation, customized tags and recommendations pages.",
44
"demo": "https://sredevops.org",
5-
"version": "1.1.2",
5+
"version": "1.1.3",
66
"engines": {
77
"ghost": ">=5.0.0"
88
},

0 commit comments

Comments
 (0)