Skip to content

Commit

Permalink
Merge pull request #35 from jenkinsci/release/v1.1.0
Browse files Browse the repository at this point in the history
Release/v1.1.0
  • Loading branch information
IBA-mainframe-dev authored Oct 29, 2024
2 parents 51b7eba + 23f64bd commit 8225342
Show file tree
Hide file tree
Showing 136 changed files with 8,179 additions and 808 deletions.
14 changes: 5 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
- package-ecosystem: github-actions
directory: /
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: monthly
3 changes: 0 additions & 3 deletions .github/release-drafter.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "Setup action"
description: "Prepares for execution - set up Java, Kotlin, Maven"

inputs:
jdkVersion:
description: "JDK version"
required: false
default: "17"
mavenVersion:
description: "Maven version"
required: false
default: "3.9.4"

runs:
using: "composite"
steps:
- name: Set up JDK ${{ inputs.jdkVersion }}
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ inputs.jdkVersion }}
22 changes: 22 additions & 0 deletions .github/sonar/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "Setup action"
description: "Runs sonar scans"


runs:
using: composite
steps:
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~/.sonar/caches
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Code coverage and publish results
shell: bash
run: >
./mvnw sonar:sonar
-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
-Dresults="build/reports/tests/test,build/test-results/test,build/reports/jacoco/test/html"
-Psonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
-Dsonar.coverage.jacoco.xmlReportPaths="build/reports/jacoco.xml"
15 changes: 15 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins

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

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 }}
60 changes: 60 additions & 0 deletions .github/workflows/hpi-builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Jenkins plugin .hpi build

# This workflow will build an executable Jenkins plugin in .hpi format for further manual installation in Jenkins

on: [push, workflow_dispatch]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout Jenkins plugin code
uses: actions/checkout@v4

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: maven

- name: Build Jenkins Plugin into .hpi
shell: bash
run: ./mvnw clean package

- name: Verify content of target folder
shell: bash
run: pwd && ls -l target/

- name: Archive the Build Output
uses: actions/upload-artifact@v4
with:
name: zowe-zdevops-hpi
path: target/*.hpi
compression-level: 0 # no compression


test:

runs-on: ubuntu-latest

needs: build
steps:
- name: Checkout the plugin GitHub repository
uses: actions/checkout@v4

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: maven

- name: Run Unit Tests with Maven
shell: bash
run: ./mvnw test
17 changes: 0 additions & 17 deletions .github/workflows/release-drafter.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# mvn hpi:run
work

target
.idea/
.vscode
.gradle/
build/
/*.iml


src/test/resources/trash/
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.6</version>
<version>1.8</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
-DaltDeploymentRepository=maven.jenkins-ci.org::default::https://repo.jenkins-ci.org/releases/
-Dchangelist.format=%d.v%s
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.1
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* Copyright IBA Group 2022
*/

buildPlugin(useContainerAgent: true, tests: [[skip: 'true']], configurations: [[ platform: 'linux', jdk: '11' ]])
buildPlugin(useContainerAgent: true, configurations: [[ platform: 'linux', jdk: '17' ]])
Loading

0 comments on commit 8225342

Please sign in to comment.