Skip to content

Commit 4d4ba25

Browse files
committed
Trying to get build working again
1 parent f4633ed commit 4d4ba25

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/server.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,29 @@ jobs:
5353
echo "hibernate.dialect=org.hibernate.dialect.MySQL57InnoDBDialect" >> sakai/local.properties
5454
echo "log.config=DEBUG.org.mariadb.jdbc" >> sakai/local.properties
5555
cd ..
56-
mvn --batch-mode -DskipTests install sakai:deploy-exploded -Dmaven.tomcat.home=$TOMCAT_DIR
56+
mvn --batch-mode -DskipTests install sakai:deploy-exploded -Dmaven.tomcat.home=$TOMCAT_DIR -Denforcer.skip -Dmaven.source.skip
5757
cd library
5858
scss_dir="src/skins/default/src/sass/themes"
5959
images_dir="src/skins/default/images"
6060
while IFS= read -r file; do
6161
theme=${file##*/} # Extract the full filename
6262
theme=${theme#_} # Remove leading underscore
6363
theme=${theme%.scss} # Remove file extension
64+
65+
# Only want the custom Longsight themes
66+
if [[ "$theme" == "dark" || "$theme" == "base" || "$theme" == "light" ]]; then
67+
continue
68+
fi
69+
6470
# Check if the theme image file exists
6571
if [[ -f "src/skins/default/images/${theme}.png" ]]; then
6672
# Copy it to the sakaiLogo.png
6773
cp "src/skins/default/images/${theme}.png" "src/skins/default/images/sakaiLogo.png"
6874
fi
69-
mvn --batch-mode -o -DskipTests -Dmaven.tomcat.home=$TOMCAT_DIR install sakai:deploy-exploded -Dsakai.skin.target=$theme
75+
mvn --batch-mode -o -DskipTests -Dmaven.tomcat.home=$TOMCAT_DIR install sakai:deploy-exploded -Dsakai.skin.target=$theme -Denforcer.skip -Dmaven.source.skip
7076
done < <(find "$scss_dir" -name '_*.scss' -printf "%T@ %p\n" | sort -n | cut -d' ' -f2-)
7177
# Most recent theme for testing
72-
recent_theme=$(basename "$(git log -1 --format= --name-only --diff-filter=AM -- "library/src/skins/default/src/sass/themes/_*.scss")" .scss | sed 's/^_//')
73-
echo "skin.default=$recent_theme" >> $TOMCAT_DIR/sakai/local.properties
78+
echo "skin.default=ttuhsc" >> $TOMCAT_DIR/sakai/local.properties
7479
cd $TOMCAT_DIR
7580
bin/catalina.sh start
7681
- name: Upload Artifact

library/src/skins/default/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Sakai Default Skin",
44
"scripts": {
55
"build": "npm-run-all css-compile css-prefix",
6-
"css-compile": "sass --style=expanded --load-path=node_modules src/sass:target",
6+
"css-compile": "sass -q --style=expanded --load-path=node_modules src/sass:target",
77
"css-watch": "sass --watch --style=expanded --load-path=node_modules src/sass:target",
88
"css-lint": "stylelint src/sass/ --config config/.stylelintrc.json",
99
"css-prefix": "postcss --config config/postcss.config.js --replace target/*.css",

0 commit comments

Comments
 (0)