Skip to content

Commit

Permalink
Merge pull request #730 from CROSSINGTUD/develop
Browse files Browse the repository at this point in the history 
Update master for release
  • Loading branch information
@schlichtig
schlichtig committed Sep 16, 2024
2 parents 7042486 + 7b3bc7f commit c912ed5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 39 deletions.
37 changes: 10 additions & 27 deletions .github/workflows/deploy_and_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,6 @@ jobs:
- name: Fetch all tags
run: git fetch --tags

- name: Find built JARs
id: find_jars
run: |
CA_JAR=$(ls CryptoAnalysis/build/*.jar | grep -v 'sources\|javadoc' | head -n 1)
ANDROID_JAR=$(ls CryptoAnalysis-Android/build/*.jar | head -n 1)
echo "CA_JAR=$CA_JAR" >> $GITHUB_ENV
echo "ANDROID_JAR=$ANDROID_JAR" >> $GITHUB_ENV
CA_JAR_BASENAME=$(basename $CA_JAR)
ANDROID_JAR_BASENAME=$(basename $ANDROID_JAR)
echo "CA_JAR_BASENAME=$CA_JAR_BASENAME" >> $GITHUB_ENV
echo "ANDROID_JAR_BASENAME=$ANDROID_JAR_BASENAME" >> $GITHUB_ENV
shell: bash

- name: Extract Version from pom.xml
id: extract_version
run: |
Expand Down Expand Up @@ -82,23 +69,19 @@ jobs:
fi
done < merged_prs.txt
echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
echo "$RELEASE_NOTES" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
echo -e "$RELEASE_NOTES" > release_notes.txt
cat release_notes.txt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create and Upload Release Assets
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ env.VERSION }}
name: ${{ env.VERSION }}
body_path: release_notes.txt
files: |
${{ env.CA_JAR }}
${{ env.ANDROID_JAR }}
- name: Zip JavaCryptographicArchitecture folder
run: |
echo "Zipping the JavaCryptographicArchitecture folder..."
zip -r JavaCryptographicArchitecture.zip CryptoAnalysis/src/main/resources/JavaCryptographicArchitecture
- name: Create GitHub Release
run: |
gh release create "$VERSION" ./apps/* "CryptoAnalysisTargets/CogniCryptDemoExample/Examples.jar" "JavaCryptographicArchitecture.zip" \
--title "$VERSION" --notes-file release_notes.txt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24 changes: 12 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
<versions.maven-jar-plugin>3.4.2</versions.maven-jar-plugin>
<java.version>11</java.version>

<spdsVersion>3.2.0</spdsVersion>
<spdsVersion>3.2.1</spdsVersion>
<sootVersion>4.5.0</sootVersion>
<cryslVersion>3.0.1</cryslVersion>
<cryslVersion>3.0.2</cryslVersion>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -164,7 +164,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink</artifactId>
<version>1.14.1</version>
<version>1.15.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
Expand All @@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
</dependency>
<dependency>
<!-- Not sure why, but without this explicit dependency,
Expand Down Expand Up @@ -224,7 +224,7 @@
it has to be correct. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<version>3.10.0</version>
<executions>
<execution>
<id>attach-javadoc</id>
Expand All @@ -240,7 +240,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<configuration>
<argLine>-Xmx8G -Xms256M -Xss8M -Dmaven.home="${maven.home}"</argLine>
<reportsDirectory>${project.basedir}/shippable/testresults</reportsDirectory>
Expand All @@ -251,7 +251,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -277,7 +277,7 @@
<artifactItem>
<groupId>de.darmstadt.tu.crossing</groupId>
<artifactId>JavaCryptographicArchitecture</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
<classifier>ruleset</classifier>
<type>zip</type>
<overWrite>true</overWrite>
Expand All @@ -287,7 +287,7 @@
<artifactItem>
<groupId>de.fraunhofer.iem</groupId>
<artifactId>BouncyCastle</artifactId>
<version>3.1.2</version>
<version>3.1.3</version>
<classifier>ruleset</classifier>
<type>zip</type>
<overWrite>true</overWrite>
Expand All @@ -297,7 +297,7 @@
<artifactItem>
<groupId>de.darmstadt.tu.crossing</groupId>
<artifactId>Tink</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<classifier>ruleset</classifier>
<type>zip</type>
<overWrite>true</overWrite>
Expand All @@ -307,7 +307,7 @@
<artifactItem>
<groupId>de.paderborn.uni</groupId>
<artifactId>BouncyCastle-JCA</artifactId>
<version>3.1.2</version>
<version>3.1.3</version>
<classifier>ruleset</classifier>
<type>zip</type>
<overWrite>true</overWrite>
Expand Down Expand Up @@ -479,7 +479,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.5</version>
<version>3.2.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit c912ed5

Please sign in to comment.