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

Add weekly line, retire lines older than 2.289.x #671

Merged
merged 9 commits into from
Oct 20, 2021
Merged

Add weekly line, retire lines older than 2.289.x #671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e92688
Add weekly line
timja Oct 5, 2021
0352c7f
Merge branch 'master' into add-weekly-line
timja Oct 7, 2021
6906f93
Renames
timja Oct 7, 2021
5255a27
Tweaks
timja Oct 7, 2021
2003414
Merge branch 'master' into add-weekly-line
timja Oct 7, 2021
ce64c12
Merge branch 'master' into add-weekly-line
timja Oct 20, 2021
88fedb2
2.306 check on CI
timja Oct 20, 2021
8f0f628
Remove older lines and bump git version
timja Oct 20, 2021
4999426
Update README
timja Oct 20, 2021
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
22 changes: 22 additions & 0 deletions bom-2.303.x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>parent</artifactId>
<version>${changelist}</version>
</parent>
<artifactId>bom-2.303.x</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
</project>
2 changes: 1 addition & 1 deletion bom-latest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>parent</artifactId>
<version>${changelist}</version>
</parent>
<artifactId>bom-2.303.x</artifactId>
<artifactId>bom-weekly</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

Maybe rename the module to bom-weekly as well? If so, do not forget

bom/.github/dependabot.yml

Line 14 in 7c549ea

directory: "/bom-latest"

<packaging>pom</packaging>
<properties>
<checks-api.version>1.7.2</checks-api.version>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
</scm>
<modules>
<module>bom-latest</module>
<module>bom-2.303.x</module>
<module>bom-2.289.x</module>
<module>bom-2.277.x</module>
<module>bom-2.263.x</module>
Expand Down
13 changes: 10 additions & 3 deletions sample-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.27</version>
<version>4.28</version>
<relativePath />
</parent>
<groupId>io.jenkins.tools.bom</groupId>
Expand All @@ -13,8 +13,8 @@
<packaging>hpi</packaging>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<bom>2.303.x</bom>
<jenkins.version>2.303.1</jenkins.version>
<bom>weekly</bom>
<jenkins.version>2.314</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

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

So how do you propose to update this? Via Dependabot or some other mechanism?

Copy link
Member Author

Choose a reason for hiding this comment

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

Probably use @olblak ’s update cli

Copy link
Member

Choose a reason for hiding this comment

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

https://www.updatecli.io/docs/automate/github_action/ or https://www.updatecli.io/docs/automate/jenkins/

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah should be quite straightforward if it supports it, otherwise something like https://github.com/jenkinsci/helm-charts/blob/main/.github/workflows/sync-lts.yaml should work just fine too.

ideally fix dependabot, maybe worth looking briefly into it

Copy link
Member

Choose a reason for hiding this comment

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

Unfortunately, updatecli doesn't support updating xml files at this stage. I started working on that a while ago and then unprioritized that.

Copy link
Member

@olblak olblak Oct 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

but we could easily implement a small shell script to handle that last operation similar to what we did with AMI configuration until I finish the work on xml

Copy link
Member

Choose a reason for hiding this comment

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

@olblak maybe simple text replacement would suffice?

<java.level>8</java.level>
</properties>
<repositories>
Expand Down Expand Up @@ -344,6 +344,13 @@
</plugins>
</build>
<profiles>
<profile>
<id>2.303.x</id>
<properties>
<bom>2.303.x</bom>
<jenkins.version>2.303.1</jenkins.version>
</properties>
</profile>
<profile>
<id>2.289.x</id>
<properties>
Expand Down