Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/local klaro js v8 #13

Merged
merged 6 commits into from
Sep 7, 2023
Merged

Feat/local klaro js v8 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63510ab
feat: don’t use klaro-no-css.js from dependency
falric Aug 30, 2023
31c9049
8.0.60-0
mthege Aug 31, 2023
b1d786a
transfered klaro-no-css.js from main and pasted
mthege Sep 6, 2023
6818441
removed feat/local-klaro-js-v8 from workflows/main.yml
mthege Sep 6, 2023
bae62ff
8.0.62
mthege Sep 6, 2023
87aea5e
reset package.json
mthege Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
NPM_UPDATES_AVAILABLE: True
BUILD_INFORMATION_OUTPUT_FILE: '/config/version.js'
CXXFLAGS: '--std=c++14'
BRANCHES_SAVE_STARTING_WITH: 'refs/heads/v8'
# BRANCHES_SAVE_STARTING_WITH: 'refs/heads/feat/local-klaro-js-v8'
BRANCHES_TAG_AS_MAIN: 'True'
run: |
${{ secrets.EVOLENE_RUN_COMMAND }}
21 changes: 10 additions & 11 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ nc='\033[0m' # No Color

echo -e "${yellow}"
echo -e "|--------------------------------------------------------|"
echo -e "| Building the application with Bash and Webpack |"
echo -e "| Building the application with Bash and Webpack |"
echo -e "|--------------------------------------------------------|"


OS=$(uname -a)
echo -e "\n Building on OS: ${OS}"
echo -e "\n Building on OS: ${OS}"

echo -e "\n 1. Cleaning up & copying files"

Expand All @@ -28,7 +27,7 @@ mkdir -p ./dist/css ./dist/img ./dist/js ./dist/fonts
# Copy bootstrap.min.js and klaro-no-css.js
echo -e " -> Copying bootstrap.min.js to dist/js folder"
cp -R ./node_modules/bootstrap/dist/js/bootstrap.min.js ./dist/js
cp -R ./node_modules/klaro/dist/klaro-no-css.js ./dist/js
cp -R ./public/js/klaro-no-css.js ./dist/js

# Copy all images
echo -e " -> Copying all images to dist/img folder"
Expand All @@ -49,21 +48,21 @@ if [ $1 == "prod" ]; then
echo -e "${yellow}\n 2. Transpiling kth-bootstrap.scss and put it /dist/css folder${nc}"
npm run sass-prod

# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
echo -e "${yellow}\n 3. Parcing all js files and putting them in the /dist/js folder${nc}"
npm run babel-js-prod

# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
# echo -e "${yellow}\n 3. Parcing all js files and putting them in the /dist/js folder${nc}"
# npm run webpack
# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
# echo -e "${yellow}\n 3. Parcing all js files and putting them in the /dist/js folder${nc}"
# npm run webpack

# Run create-zip and create the kth-style-scss.zip package and put it in the dist folder
echo -e "${yellow}\n 4. Creating the kth-style-scss.zip package and putting it in the /dist folder${nc}"
npm run create-zip

ls -lR dist
if [[ ! -s dist/css/kth-bootstrap.css || ! -s dist/kth-style-scss.zip || ! -s dist/js/backtotop.js || ! -s dist/js/menus.js || ! -s dist/js/vendor.js ]];then

if [[ ! -s dist/css/kth-bootstrap.css || ! -s dist/kth-style-scss.zip || ! -s dist/js/backtotop.js || ! -s dist/js/menus.js || ! -s dist/js/vendor.js ]]; then
echo >&2 "Some files are missing, failing..."
exit 1
fi
Expand All @@ -75,7 +74,7 @@ if [ $1 == "dev" ]; then
echo -e "${yellow}\n 2. Transpiling kth-bootstra.scss and put it /dist/css folder${nc}"
npm run sass-dev

# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
# Run webpack build on the vendor.js file and put the optimized file in the /dist folder.
echo -e "${yellow}\n 3. Parcing all js files and putting them in the /dist/js folder${nc}"
npm run webpack-watch

Expand Down
Loading
Loading