Skip to content

Commit

Permalink
Build wiki compatibility table while release build
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 9bc0fac
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:45:21 2022 +0200

    update wiki about pages

commit 84cb89e
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:45:07 2022 +0200

    fix imports

commit b2972a7
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:23:13 2022 +0200

    update version in changelog

commit 7849f1e
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:22:44 2022 +0200

    build wiki compatibility table while relese build

commit ba6f6df
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:22:06 2022 +0200

    update compatibility-table

commit 7fec33b
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Nov 21 16:21:33 2022 +0200

    revert error on some diffs for compatibility table
  • Loading branch information
slavaleleka committed Nov 21, 2022
1 parent 5c5aa46 commit a93958a
Show file tree
Hide file tree
Showing 9 changed files with 2,439 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Scriptlets and Redirect Resources Changelog

## v1.7.1
## v1.7.2

### Added

Expand Down
2 changes: 2 additions & 0 deletions bamboo-specs/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ Build:
yarn install ${bamboo.varsYarn}
yarn build
yarn wiki:build-docs
yarn wiki:build-table
rm -rf node_modules
- inject-variables:
Expand Down
10 changes: 6 additions & 4 deletions scripts/build-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ const path = require('path');
const yaml = require('js-yaml');
const { EOL } = require('os');

const { getDataFromFiles } = require('./helpers');
const {
getDataFromFiles,
SCRIPTLET_TYPE,
TRUSTED_SCRIPTLET_TYPE,
REDIRECT_TYPE,
} = require('./helpers');

const {
WIKI_DIR_PATH,
Expand All @@ -12,9 +17,6 @@ const {
redirectsFilenames,
SCRIPTLETS_SRC_RELATIVE_DIR_PATH,
REDIRECTS_SRC_RELATIVE_DIR_PATH,
SCRIPTLET_TYPE,
TRUSTED_SCRIPTLET_TYPE,
REDIRECT_TYPE,
} = require('./constants');

const STATIC_REDIRECTS_FILENAME = 'static-redirects.yml';
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-sources-updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,6 @@ async function checkForABPRedirectsUpdates() {
${added.length ? `Added: ${added}.` : ''}
`;

console.log(message);
throw new Error(message);
}
}());
5 changes: 4 additions & 1 deletion scripts/compatibility-table.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@
},
{
"ubo": "xml-prune.js"
},
{
"ubo": "m3u-prune.js"
}
],
"redirects": [
Expand Down Expand Up @@ -448,4 +451,4 @@
"ubo": "noop-0.5s.mp3"
}
]
}
}
Loading

0 comments on commit a93958a

Please sign in to comment.