Skip to content

Commit 7c33e51

Browse files
Merge pull request #161 from splunk/DVPL-9687
Github Actions: Test & Release implemented.
2 parents 0f8727e + 105aaea commit 7c33e51

File tree

5 files changed

+108
-8
lines changed

5 files changed

+108
-8
lines changed

.github/workflows/release.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
on:
2+
release:
3+
types: [published]
4+
5+
name: Create Release
6+
7+
jobs:
8+
build:
9+
name: Create Release
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Set up JDK 1.8
14+
uses: actions/setup-java@v1
15+
with:
16+
java-version: 1.8
17+
server-username: MAVEN_USERNAME
18+
server-password: MAVEN_PASSWORD
19+
server-id: splunk-artifactory
20+
- name: build
21+
run: mvn package --file pom.xml -DskipTests=true
22+
- name: Create GitHub Release
23+
uses: softprops/action-gh-release@v1
24+
with:
25+
# body_path: ${{ github.workflow }}-CHANGELOG.txt
26+
files: ./target/*.jar
27+
draft: true
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
- name: Deploy to Artifactory
31+
run: mvn --batch-mode deploy -DskipTests=true
32+
env:
33+
MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
34+
MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

.github/workflows/test.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Java SDK Test
2+
3+
on:
4+
[push, pull_request]
5+
6+
jobs:
7+
test:
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
os:
12+
- ubuntu-latest
13+
java-version:
14+
- 1.8
15+
splunk-version:
16+
- "8.0"
17+
- "8.2.0"
18+
runs-on: ${{ matrix.os }}
19+
20+
services:
21+
splunk:
22+
image: splunk/splunk:${{matrix.splunk-version}}
23+
env:
24+
SPLUNK_START_ARGS: --accept-license
25+
SPLUNK_PASSWORD: changed!
26+
TEST_TCP_PORT: 10667
27+
TEST_UDP_PORT: 10668
28+
SPLUNK_HOME: "/opt/splunk"
29+
ports:
30+
- 8000:8000
31+
- 8089:8089
32+
- 8088:8088
33+
- 10667:10667
34+
- 10668:10668/udp
35+
36+
steps:
37+
- uses: actions/checkout@v2
38+
- name: Set up JDK
39+
uses: actions/setup-java@v1
40+
with:
41+
java-version: 1.8
42+
43+
- name: Cache local Maven repository
44+
uses: actions/cache@v2
45+
with:
46+
path: ~/.m2/repository
47+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
48+
restore-keys: ${{ runner.os }}-maven-
49+
50+
- name: Create .splunkrc file
51+
run: |
52+
cd ~
53+
echo host=localhost >> .splunkrc
54+
echo port=8089 >> .splunkrc
55+
echo username=admin >> .splunkrc
56+
echo password=changed! >> .splunkrc
57+
echo scheme=https >> .splunkrc
58+
echo version=${{ matrix.splunk }} >> .splunkrc
59+
60+
- name: Test using maven
61+
run: make test
62+
env:
63+
SPLUNK_HOME: "/opt/splunk"
64+
TEST_TCP_PORT: 10667
65+
TEST_UDP_PORT: 10668

examples/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<plugin>
2525
<groupId>org.apache.maven.plugins</groupId>
2626
<artifactId>maven-deploy-plugin</artifactId>
27+
<version>3.0.0-M1</version>
2728
<configuration>
2829
<skip>true</skip>
2930
</configuration>

pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<properties>
9-
<version.number>1.6.4</version.number>
9+
<version.number>1.6.5</version.number>
1010
<maven.resources.overwrite>true</maven.resources.overwrite>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<maven.compiler.source>8</maven.compiler.source>
@@ -58,11 +58,14 @@
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-deploy-plugin</artifactId>
61+
<version>3.0.0-M1</version>
6162
<configuration>
63+
<!-- Below altDeploymentRepository is used for local deployment. Commented out for now. -->
64+
<!--
6265
<altDeploymentRepository>
63-
<!-- local::file:./target/local-deploy-->
6466
localRepository::default::file:./target/local-deploy
6567
</altDeploymentRepository>
68+
-->
6669
<skip>true</skip>
6770
</configuration>
6871
</plugin>
@@ -77,14 +80,13 @@
7780
</repository>
7881
</repositories>
7982

80-
<!-- Distribution Management is commented for now as we are focusing on local deployment only. -->
81-
<!-- <distributionManagement>
83+
<distributionManagement>
8284
<repository>
8385
<id>splunk-artifactory</id>
8486
<name>Splunk Releases</name>
8587
<url>https://splunk.jfrog.io/splunk/ext-releases-local</url>
8688
</repository>
87-
</distributionManagement>-->
89+
</distributionManagement>
8890

8991
<licenses>
9092
<license>

splunk/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<version>1.0.0</version>
1313
</parent>
1414
<properties>
15-
<!-- <jvm.arg.https.protocol>-Dhttps.protocols=TLSv1.1,TLSv1.2</jvm.arg.https.protocol> -->
1615
<https.protocols>TLSv1.2</https.protocols>
17-
<!-- <maven.javadoc.skip>true</maven.javadoc.skip>-->
1816
</properties>
1917
<dependencies>
2018
<dependency>
@@ -65,7 +63,6 @@
6563
<configuration>
6664
<skipTests>${skipTests}</skipTests>
6765
<runOrder>alphabetical</runOrder>
68-
<!-- <argLine>${jvm.arg.https.protocol}</argLine> -->
6966
<systemProperties>
7067
<https.protocols>${https.protocols}</https.protocols>
7168
</systemProperties>
@@ -97,6 +94,7 @@
9794
<plugin>
9895
<groupId>org.apache.maven.plugins</groupId>
9996
<artifactId>maven-deploy-plugin</artifactId>
97+
<version>3.0.0-M1</version>
10098
<configuration>
10199
<skip>false</skip>
102100
</configuration>

0 commit comments

Comments
 (0)