From eaa025445e63dd6921ec9719c2b8a5a94cddf121 Mon Sep 17 00:00:00 2001 From: Raphael Heitjohann <5891816+rheitjoh@users.noreply.github.com> Date: Mon, 19 Apr 2021 11:24:31 +0200 Subject: [PATCH 1/3] Make craco api dependency, remove math dependency, make javadoc include math and craco javadocs only on release and increment version to 1.1.0 --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index d8a9cc0..9b95c6c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { group 'org.cryptimeleon' archivesBaseName = project.name boolean isRelease = project.hasProperty("release") -version = '1.0.1' + (isRelease ? "" : "-SNAPSHOT") +version = '1.1.0' + (isRelease ? "" : "-SNAPSHOT") sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -30,9 +30,7 @@ dependencies { def cracoVersion = cracoVersionNoSuffix + (isRelease ? "" : "-SNAPSHOT") def mathVersion = mathVersionNoSuffix + (isRelease ? "" : "-SNAPSHOT") - implementation group: 'org.cryptimeleon', name: 'craco', version: cracoVersion - implementation group: 'org.cryptimeleon', name: 'math', version: mathVersion - + api group: 'org.cryptimeleon', name: 'craco', version: cracoVersion // For using craco tests on the schemes testImplementation(group: 'org.cryptimeleon', name: 'craco', version: cracoVersion) { @@ -80,9 +78,11 @@ test { task javadocLatex(type: Javadoc) { source = sourceSets.main.allJava classpath = sourceSets.main.runtimeClasspath - // link to math and craco javadocs - options { - links "https://javadoc.io/doc/org.cryptimeleon/math/" + mathVersionNoSuffix, "https://javadoc.io/doc/org.cryptimeleon/craco/" + cracoVersionNoSuffix + if (isRelease) { + // link to math and craco javadocs + options { + links "https://javadoc.io/doc/org.cryptimeleon/math/" + mathVersionNoSuffix, "https://javadoc.io/doc/org.cryptimeleon/craco/" + cracoVersionNoSuffix + } } // enable latex rendering via mathjax options.addBooleanOption("-allow-script-in-comments", true) From 046bd96e824db67c3ec3480cad30053f75a90126 Mon Sep 17 00:00:00 2001 From: Raphael Heitjohann <5891816+rheitjoh@users.noreply.github.com> Date: Mon, 26 Apr 2021 09:35:00 +0200 Subject: [PATCH 2/3] Add specific actions workflow for scheduled release build --- .github/workflows/release-ci.yaml | 3 --- .github/workflows/scheduled-release-ci.yaml | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/scheduled-release-ci.yaml diff --git a/.github/workflows/release-ci.yaml b/.github/workflows/release-ci.yaml index 681b690..7199f5c 100644 --- a/.github/workflows/release-ci.yaml +++ b/.github/workflows/release-ci.yaml @@ -5,9 +5,6 @@ on: branches: - main - 'release/**' - # Nightly builds to ensure dependencies don't break anything - schedule: - - cron: '0 0 * * *' jobs: build: diff --git a/.github/workflows/scheduled-release-ci.yaml b/.github/workflows/scheduled-release-ci.yaml new file mode 100644 index 0000000..dc724f6 --- /dev/null +++ b/.github/workflows/scheduled-release-ci.yaml @@ -0,0 +1,20 @@ +name: Scheduled Release Java CI + +on: + # Nightly builds to ensure dependencies don't break anything + schedule: + - cron: '0 0 * * *' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: main + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build -PcheckoutIfCloned -Prelease From 9c454f00fa7fa5d8a3723419045030c96a5ba2fb Mon Sep 17 00:00:00 2001 From: Raphael Heitjohann <5891816+rheitjoh@users.noreply.github.com> Date: Mon, 26 Apr 2021 09:41:43 +0200 Subject: [PATCH 3/3] Add readme badge for scheduled CI --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 632eafe..44932cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![Build Status](/~https://github.com/cryptimeleon/predenc/workflows/Development%20Java%20CI/badge.svg) ![Build Status](/~https://github.com/cryptimeleon/predenc/workflows/Release%20Java%20CI/badge.svg) +![Build Status](/~https://github.com/cryptimeleon/predenc/workflows/Scheduled%20Release%20Java%20CI/badge.svg) # Predenc The Cryptimeleon Predenc project contains various predicate encryption implementations such as attribute-based encryption or identity-based encryption.