Skip to content

Commit

Permalink
update build
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoayyed committed Dec 4, 2022
1 parent f0da75b commit 5c1c1a3
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/initializr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
distribution: 'temurin'
- name: Build Initializr
run: ./gradlew --build-cache --configure-on-demand --no-daemon clean build -x test -x javadoc -x check --parallel
- name: Validate Initializr
run: ./ci/validate-initializr.sh
- uses: actions/upload-artifact@v3
with:
name: binary-artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ private static void handleApplicationServerType(final ProjectDescription project
} else if (dependencies.containsKey("webapp-undertow")) {
appServer = "-undertow";
}
if (dependencies.containsKey("webapp")) {
appServer = "";
}

defaults.put("appServer", appServer);
}

Expand Down
1 change: 0 additions & 1 deletion app/src/main/resources/common/gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ bin/
*.iml
*.log
tmp/
.java-version
./apache-tomcat
apache-tomcat.zip
config-metadata.properties
34 changes: 34 additions & 0 deletions ci/validate-initializr.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash

set -e

source ./ci/functions.sh

echo "Building CAS Initializr"
./gradlew --build-cache --configure-on-demand --no-daemon \
clean build -x test -x javadoc -x check --parallel -q

echo "Launching CAS Initializr"
java -jar app/build/libs/app.jar &
pid=$!
sleep 20

echo "Checking CAS Initializr metadata"
curl -H 'Accept: application/json' http://localhost:8080 | jq

echo "Checking CAS Initializr dependencies"
curl -H 'Accept: application/json' http://localhost:8080/dependencies | jq

echo "Checking CAS Initializr info"
curl -H 'Accept: application/json' http://localhost:8080/actuator/info | jq

echo "Checking CAS Initializr supported versions"
curl -H 'Accept: application/json' http://localhost:8080/actuator/supportedVersions | jq

echo "Checking CAS Initializr UI"
curl http://localhost:8080/ui

echo "\nAll CAS Initializr checks have passed"

kill -9 $pid
[ "$CI" = "true" ] && pkill java
2 changes: 1 addition & 1 deletion ic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rm -Rf ./tmp

CAS_VERSION="7.0.0-SNAPSHOT"
BOOT_VERSION="2.7.4"
BOOT_VERSION="3.0.0"

#CAS_VERSION="6.3.7.2"
#BOOT_VERSION="2.3.7.RELEASE"
Expand Down

0 comments on commit 5c1c1a3

Please sign in to comment.