Skip to content

Commit

Permalink
Merge branch 'cdancy:master' into joblist-tree-depth
Browse files Browse the repository at this point in the history
  • Loading branch information
choweiyuan authored Aug 23, 2023
2 parents 493fdc4 + e2a3572 commit a3239fd
Show file tree
Hide file tree
Showing 10 changed files with 216 additions and 145 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/github-actions.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Jenkins REST CI Build
run-name: ${{ github.actor }} is running Jenkins REST CI Build on GitHub Actions 🚀
on: [push, pull_request_target]
jobs:
build:
# You must use a Linux environment when using service containers or container jobs
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 11, 17 ]
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: ${{ matrix.java-version }}
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- name: Build Jenkins LTS docker images
run: docker build -t jenkins-rest/jenkins src/main/docker

- name: Run Jenkins LTS docker images
run: docker run -d --rm -p 8080:8080 --name jenkins-rest jenkins-rest/jenkins

- name: Setup Gradle Build Action
uses: gradle/[email protected]

- name: Execute Gradle build
run: ./gradlew clean build mockTest integTest --stacktrace

- run: echo "🍏 This job's status is ${{ job.status }}."
- name: Stop docker
run: docker stop jenkins-rest
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'com.github.johnrengelman.shadow' version '7.1.1'
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/additional-artifacts.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
shadowJar {
classifier = 'all'
archiveClassifier = 'all'
mergeServiceFiles()

def foundGroup = rootProject.findProperty('group')
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit a3239fd

Please sign in to comment.