Skip to content

Commit

Permalink
Merge pull request #170 from p2m2/develop
Browse files Browse the repository at this point in the history
build 0.3.2.c
  • Loading branch information
ofilangi committed Apr 14, 2022
2 parents 41d92fb + 378b9b8 commit 13da815
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ jobs:
cp $(find ./js -name discovery-fastopt-bundle.js) ./dist/discovery-web-dev.js
cp $(find ./js -name discovery-fastopt-bundle.js.map) ./dist/discovery-web-dev.js.map
cp $(find ./js -name discovery-opt-bundle.js) ./dist/discovery-web.js
if [[ ! -z "$(git status -s | grep -v -E "^\?\?")" ]]; then
git commit dist -m"[ci skip] - Javascript librairies publication"
git push -q https://${GITHUB_TOKEN}@github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git $BRANCH
Expand Down Expand Up @@ -307,7 +308,10 @@ jobs:
if [ "LAST_VERSION" != "VERSION" ]; then
sbt discoveryJVM/assembly
mkdir -p build
mv $(find . -name d*-assembly-*.jar) build/
mv $(find . -name d*-assembly-*.jar) build/discovery-$VERSION.jar
cp dist/discovery-web-dev.js build/discovery-web-dev-$VERSION.js
cp dist/discovery-web-dev.js.map build/discovery-web-dev-$VERSION.js.map
cp dist/discovery-web.js build/discovery-web-$VERSION.js
fi
- persist_to_workspace:
Expand All @@ -333,14 +337,12 @@ jobs:
# -------------------------------------------------------
if [ "LAST_VERSION" != "VERSION" ]; then
go get github.com/tcnksm/ghr
JAR=discovery-$VERSION.jar
cp $(find build -name discovery*.jar) $JAR
ghr -t ${GITHUB_TOKEN} \
-u ${CIRCLE_PROJECT_USERNAME} \
-r ${CIRCLE_PROJECT_REPONAME} \
-c ${CIRCLE_SHA1} \
-n $VERSION \
-delete $VERSION $JAR
-delete $VERSION build/
fi
# obsolete
check_discovery_valid_fullopjs_cdn_jsdelivr:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ lazy val tsjest = "27.1.3"

releaseIgnoreUntrackedFiles := true

val static_version_build = "0.3.2b"
val static_version_build = "0.3.2c"
val version_build = scala.util.Properties.envOrElse("DISCOVERY_VERSION", static_version_build )
val SWDiscoveryVersionAtBuildTimeFile = "./shared/src/main/scala/inrae/semantic_web/SWDiscoveryVersionAtBuildTime.scala"

Expand Down

0 comments on commit 13da815

Please sign in to comment.