Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable CD on bouncycastle-api #133

Merged
merged 4 commits into from
Dec 6, 2023
Merged

enable CD on bouncycastle-api #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c725fc
enable CD on bouncycastle-api
ampuscas Dec 4, 2023
bc1dfa8
tie to bouncycastle version
ampuscas Dec 4, 2023
2de04c0
modify version
ampuscas Dec 4, 2023
c248b9c
Update pom.xml
ampuscas Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
3 changes: 0 additions & 3 deletions .github/release-drafter.yml
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins

name: cd
on:
workflow_dispatch:
check_run:
types:
- completed

permissions:
checks: read
contents: write

jobs:
maven-cd:
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
secrets:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
16 changes: 0 additions & 16 deletions .github/workflows/release-drafter.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
-Dchangelist.format=%d.v%s
13 changes: 6 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</parent>

<artifactId>bouncycastle-api</artifactId>
<version>${revision}${changelist}</version>
<version>2.30.${revision}-${changelist}</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 2.30 and not simply 3?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because then we would need to wait for bouncycastle v4 rather than a v3 (or a v > 2.30). #133 (comment)

Granted we are a way of v2 let alone v3 or a v4. the earth may have imploded by the time we get either...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

…if you cared about

we would then be able to remove the prefix

that is.

<packaging>hpi</packaging>

<name>bouncycastle API Plugin</name>
Expand Down Expand Up @@ -66,10 +66,9 @@
</scm>

<properties>
<revision>2.30</revision>
<changelist>-SNAPSHOT</changelist>
<revision>1.77</revision>
<changelist>999999-SNAPSHOT</changelist>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as this is an API plugin we should not use random versions. Whilst we have already shot past the version of the bouncycastle plugin we should probably take the time to not make this worse.

You can tie the revision to the bouncycastle version (e.g. remove bouncycastleVersion and where it is used in the pom use revision then change version to 2.29.

<jenkins.version>2.361.4</jenkins.version>
<bouncycastleVersion>1.77</bouncycastleVersion>
<useBeta>true</useBeta>
</properties>

Expand Down Expand Up @@ -99,17 +98,17 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastleVersion}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastleVersion}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastleVersion}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand Down