From 22948e3a6a99a7443d0d8a84983473b363543316 Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Thu, 6 Oct 2022 15:57:41 +0530 Subject: [PATCH 1/7] Update release.yml test doc generation update --- .github/workflows/release.yml | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4cdce89..036fec0a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ on: - release: - types: [published] + [push] +# release: +# types: [published] name: Release @@ -21,22 +22,25 @@ jobs: run: mvn package --file pom.xml -DskipTests=true - name: Create temp artifacts apidocs folder run: mkdir apidocs - - name: Create GitHub Release - uses: softprops/action-gh-release@v1 - with: -# body_path: ${{ github.workflow }}-CHANGELOG.txt - files: ./target/*.jar - draft: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Deploy to Artifactory - run: mvn --batch-mode deploy -DskipTests=true - env: - MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} +# - name: Create GitHub Release +# uses: softprops/action-gh-release@v1 +# with: +## body_path: ${{ github.workflow }}-CHANGELOG.txt +# files: ./target/*.jarln -s /data/to/zip/data.txt data.txt +# draft: true +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Deploy to Artifactory +# run: mvn --batch-mode deploy -DskipTests=true +# env: +# MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - name: Zip docs - run: zip -r apidocs/docs.zip splunk/target/apidocs + run: | + cd splunk/target/apidocs + zip -r ./../../../apidocs/docs.zip ./* + cd ../../.. - name: Upload Artifact uses: actions/upload-artifact@v3 From f92e84a2dfd5f654e1677db7b612d4f51bbffc67 Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Thu, 6 Oct 2022 16:04:51 +0530 Subject: [PATCH 2/7] Update release.yml reverting test code in the release.yml --- .github/workflows/release.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 036fec0a..fa5c0b59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,6 @@ on: - [push] -# release: -# types: [published] + release: + types: [published] name: Release @@ -22,19 +21,19 @@ jobs: run: mvn package --file pom.xml -DskipTests=true - name: Create temp artifacts apidocs folder run: mkdir apidocs -# - name: Create GitHub Release -# uses: softprops/action-gh-release@v1 -# with: -## body_path: ${{ github.workflow }}-CHANGELOG.txt -# files: ./target/*.jarln -s /data/to/zip/data.txt data.txt -# draft: true -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Deploy to Artifactory -# run: mvn --batch-mode deploy -DskipTests=true -# env: -# MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} -# MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + - name: Create GitHub Release + uses: softprops/action-gh-release@v1 + with: +# body_path: ${{ github.workflow }}-CHANGELOG.txt + files: ./target/*.jarln -s /data/to/zip/data.txt data.txt + draft: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Deploy to Artifactory + run: mvn --batch-mode deploy -DskipTests=true + env: + MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - name: Zip docs run: | From 0acbf61108021da908528af8129e619516bb63df Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 7 Oct 2022 12:18:25 +0530 Subject: [PATCH 3/7] test doc upload --- .github/workflows/release.yml | 45 ++++++++++++++++++----------------- .github/workflows/test.yml | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa5c0b59..ffb2d813 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ on: - release: - types: [published] + [push] +# release: +# types: [published] name: Release @@ -21,28 +22,28 @@ jobs: run: mvn package --file pom.xml -DskipTests=true - name: Create temp artifacts apidocs folder run: mkdir apidocs - - name: Create GitHub Release - uses: softprops/action-gh-release@v1 - with: -# body_path: ${{ github.workflow }}-CHANGELOG.txt - files: ./target/*.jarln -s /data/to/zip/data.txt data.txt - draft: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Deploy to Artifactory - run: mvn --batch-mode deploy -DskipTests=true - env: - MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - - - name: Zip docs - run: | - cd splunk/target/apidocs - zip -r ./../../../apidocs/docs.zip ./* - cd ../../.. +# - name: Create GitHub Release +# uses: softprops/action-gh-release@v1 +# with: +## body_path: ${{ github.workflow }}-CHANGELOG.txt +# files: ./target/*.jarln -s /data/to/zip/data.txt data.txt +# draft: true +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Deploy to Artifactory +# run: mvn --batch-mode deploy -DskipTests=true +# env: +# MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} +# +# - name: Zip docs +# run: | +# cd splunk/target/apidocs +# zip -r ./../../../apidocs/docs.zip ./* +# cd ../../.. - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: apidocs - path: apidocs/docs.zip + path: splunk/target/apidocs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84ca35c8..1efa040f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,7 @@ name: Java SDK Test on: - [push, pull_request] + [ pull_request] jobs: test: From 8dcad3ac093b1b2f4384985e5c7bc28072a9be3e Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 7 Oct 2022 15:32:13 +0530 Subject: [PATCH 4/7] Update release.yml --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffb2d813..07363b80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,6 @@ jobs: server-id: splunk-artifactory - name: build run: mvn package --file pom.xml -DskipTests=true - - name: Create temp artifacts apidocs folder - run: mkdir apidocs # - name: Create GitHub Release # uses: softprops/action-gh-release@v1 # with: @@ -45,5 +43,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: apidocs + name: docs-java-sdk path: splunk/target/apidocs From 3dad76bd4f4248e996c3cd2589fa1f88520c38b2 Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 7 Oct 2022 15:34:17 +0530 Subject: [PATCH 5/7] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07363b80..f29c7a9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,5 +43,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: docs-java-sdk + name: java_sdk_docs path: splunk/target/apidocs From e7b35781e89e4679ac058fcd4cf761364d2d05cf Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 7 Oct 2022 15:39:55 +0530 Subject: [PATCH 6/7] reverted changes done for test purpose --- .github/workflows/release.yml | 37 ++++++++++++++--------------------- .github/workflows/test.yml | 2 +- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f29c7a9a..9d899e6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,6 @@ on: - [push] -# release: -# types: [published] + release: + types: [published] name: Release @@ -20,25 +19,19 @@ jobs: server-id: splunk-artifactory - name: build run: mvn package --file pom.xml -DskipTests=true -# - name: Create GitHub Release -# uses: softprops/action-gh-release@v1 -# with: -## body_path: ${{ github.workflow }}-CHANGELOG.txt -# files: ./target/*.jarln -s /data/to/zip/data.txt data.txt -# draft: true -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# - name: Deploy to Artifactory -# run: mvn --batch-mode deploy -DskipTests=true -# env: -# MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} -# MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} -# -# - name: Zip docs -# run: | -# cd splunk/target/apidocs -# zip -r ./../../../apidocs/docs.zip ./* -# cd ../../.. + - name: Create GitHub Release + uses: softprops/action-gh-release@v1 + with: +# body_path: ${{ github.workflow }}-CHANGELOG.txt + files: ./target/*.jarln -s /data/to/zip/data.txt data.txt + draft: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Deploy to Artifactory + run: mvn --batch-mode deploy -DskipTests=true + env: + MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - name: Upload Artifact uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1efa040f..84ca35c8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,7 @@ name: Java SDK Test on: - [ pull_request] + [push, pull_request] jobs: test: From d9c0ce4685f1bea83878b23bd01e144767fe0504 Mon Sep 17 00:00:00 2001 From: Abhi Shah Date: Fri, 21 Oct 2022 12:26:32 +0530 Subject: [PATCH 7/7] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d899e6f..2df6aeb3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: uses: softprops/action-gh-release@v1 with: # body_path: ${{ github.workflow }}-CHANGELOG.txt - files: ./target/*.jarln -s /data/to/zip/data.txt data.txt + files: ./target/*.jar draft: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}