Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hypery2k committed Oct 28, 2022
2 parents 1d6f18d + f72c1d1 commit 6fecf62
Show file tree
Hide file tree
Showing 26 changed files with 867 additions and 367 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: CI

on: [push]

permissions:
security-events: write
contents: read
actions: read

jobs:
build:
strategy:
matrix:
os: [ubuntu-latest]
java: [8, 11]
fail-fast: false

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up cache for ~./m2/repository
uses: actions/[email protected]
with:
path: ~/.m2/repository
key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-${{ matrix.os }}-java${{ matrix.java }}-
maven-${{ matrix.os }}-
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}

security-scan:
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
with:
java-cache: 'maven'
java-version: 11

deploy:
needs: [build]
runs-on: ubuntu-latest

steps:
- name: Check out
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8

- name: publish release package
if: contains( github.ref, 'master' ) || contains( github.base_ref, 'master' )
env:
JENKINS_MAVEN_PASS: ${{ secrets.JENKINS_MAVEN_PASS }}
run: ./mvnw -s .github/workflows/m2.settings.xml deploy -DskipTests=true
56 changes: 56 additions & 0 deletions .github/workflows/m2.settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<servers>
<server>
<id>central</id>
<username>${JENKINS_MAVEN_USER}</username>
<password>${JENKINS_MAVEN_PASS}</password>
</server>
<server>
<id>snapshots</id>
<username>${JENKINS_MAVEN_USER}</username>
<password>${JENKINS_MAVEN_PASS}</password>
</server>
</servers>
<profiles>
<profile>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>remote-snapshot-repos</name>
<url>https://repo.jenkins-ci.org/artifactory/remote-snapshot-repos</url>
</repository>
<repository>
<snapshots />
<id>snapshots</id>
<name>remote-snapshot-repos</name>
<url>https://repo.jenkins-ci.org/artifactory/remote-snapshot-repos</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>remote-snapshot-repos</name>
<url>https://repo.jenkins-ci.org/artifactory/remote-snapshot-repos</url>
</pluginRepository>
<pluginRepository>
<snapshots />
<id>snapshots</id>
<name>remote-snapshot-repos</name>
<url>https://repo.jenkins-ci.org/artifactory/remote-snapshot-repos</url>
</pluginRepository>
</pluginRepositories>
<id>artifactory</id>
</profile>
</profiles>
<activeProfiles>
<activeProfile>artifactory</activeProfile>
</activeProfiles>
</settings>
20 changes: 14 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@

# Created by https://www.gitignore.io/api/java,maven,netbeans,intellij,eclipse

### Eclipse ###

# OS stuff
*.icloud
._*
.DS_Store
Thumbs.db
Desktop.ini
.Spotlight-V100
.Trashes

# IDE stuff
.idea/*
*.iml
*.ipr
.metadata
bin/
tmp/
Expand Down Expand Up @@ -200,4 +208,4 @@ nbdist/

.idea/
work/
nbactions.xml
nbactions.xml
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
# (2021-12-17)
# [2.3](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v2.2...v2.3.0) (2022-10-28)

# Features
* Modernize Plugin (thanks to @sghill for his [contribution](https://github.com/jenkinsci/log-parser-plugin/pull/38))

### Bug Fixes

* Colors & hints on trend graphs do not match to the data ([413b828](https://github.com/jenkinsci/log-parser-plugin/commit/413b828a52855a6345f72e869ba803544393160e))
* docker-compose up doesn't support --rm ([d613f5e](https://github.com/jenkinsci/log-parser-plugin/commit/d613f5ef8a166edc518f580165a8367746a463c0))
* Jenkins Log Parser Debug Icon not shown ([1e930e0](https://github.com/jenkinsci/log-parser-plugin/commit/1e930e00df73337ea75d8fe8d9caa38e3d7a792a))
* **Memory:** Correct potential OOM when parsing logs in workflows ([#36](https://github.com/jenkinsci/log-parser-plugin/issues/36)) ([bff7f9f](https://github.com/jenkinsci/log-parser-plugin/commit/bff7f9f53820aade452a4c44441bbfabc905931e)), closes [/github.com/jenkinsci/workflow-job-plugin/blob/1551f82/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java#L1105](https://github.com//github.com/jenkinsci/workflow-job-plugin/blob/1551f82/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java/issues/L1105)
* Now Jenkins is available on port 8081 and boots ([f269c53](https://github.com/jenkinsci/log-parser-plugin/commit/f269c53fa0ddb5ae28ae3719afe6d6ee3ccc9d8e))



# [2.2](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v2.1...v2.2) (2021-12-17)


### Bug Fixes

* docker-compose up doesn't support --rm ([d613f5e](https://github.com/jenkinsci/log-parser-plugin/commit/d613f5ef8a166edc518f580165a8367746a463c0))
* Now Jenkins is available on port 8081 and boots ([f269c53](https://github.com/jenkinsci/log-parser-plugin/commit/f269c53fa0ddb5ae28ae3719afe6d6ee3ccc9d8e))
48 changes: 0 additions & 48 deletions Jenkinsfile_dev

This file was deleted.

Loading

0 comments on commit 6fecf62

Please sign in to comment.