Skip to content

Commit

Permalink
minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dpsoft committed Sep 23, 2023
1 parent d70e0c9 commit ded0fb8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 25 deletions.
38 changes: 14 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@
name: Test all the things

on: [ push, pull_request ]
on: [push, pull_request]

jobs:
build-agent:
runs-on: ubuntu-latest
name: Build agent with Java 8
strategy:
matrix:
java: [ 8 ]
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'zulu'
- name: Build agent with Java 8
run: ./gradlew wrapper --gradle-version=7.6.2 :agent:publishToMavenLocal

ci:
runs-on: ubuntu-latest
name: Test with different Java versions
name: Java ${{ matrix.java }}
strategy:
matrix:
java: [ 11, 17, 18 ]
java: [ 8, 11, 17, 18 ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
- uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
java-version: ${{ matrix.java }}
cache: 'gradle'
- name: Test
run: |
./gradlew wrapper --gradle-version=7.6.2 assemble
./travis-test.sh
run: ./gradlew wrapper --gradle-version=7.6.2 :agent:publishToMavenLocal && ./gradlew wrapper --gradle-version=7.6.2 assemble && ./travis-test.sh
2 changes: 1 addition & 1 deletion agent-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id 'java'
id 'application'
id 'scala'
id 'com.github.maiflai.scalatest' version '0.32'
id 'com.github.maiflai.scalatest' version '0.31'
}

mainClassName = 'app.kanela.JavaMainWithAgent'
Expand Down

0 comments on commit ded0fb8

Please sign in to comment.