Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Commit

Permalink
chore: reorganize repo - add java folder (#26)
Browse files Browse the repository at this point in the history
* chore: reorganize repo - add java folder

Signed-off-by: Luca Stocchi <lstocchi@redhat.com>

* fix ci builds and fix based on review

Signed-off-by: Luca Stocchi <lstocchi@redhat.com>

* fix workflow location file

Signed-off-by: Luca Stocchi <lstocchi@redhat.com>

* fix Jenkinsfile and release workflow

Signed-off-by: Luca Stocchi <lstocchi@redhat.com>
  • Loading branch information
lstocchi authored Jul 2, 2021
1 parent 1d56c15 commit 7678de7
Show file tree
Hide file tree
Showing 134 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: mvn -B verify --file pom.xml
run: mvn -B verify -f java

build-native:

Expand All @@ -49,4 +49,4 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: mvn -B verify -Pnative
run: mvn -B verify -Pnative -f java
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
call mvn -B verify -Pnative
7z a alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }} alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-runner.exe
call mvn -B verify -Pnative -f java
7z a java/alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }} java/alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-runner.exe
if: ${{ matrix.os == 'windows-latest' }}
- name: Build with Maven
run: |
mvn -B verify -Pnative
tar cfJ alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }} alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-runner
mvn -B verify -Pnative -f java
tar cfJ java/alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }} java/alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-runner
if: ${{ matrix.os != 'windows-latest' }}
- name: Simple conventional changelog
uses: lstocchi/simple-conventional-changelog@0.0.6
Expand All @@ -70,7 +70,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
allowUpdates: true
artifact: alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }}
artifact: java/alizer-cli/target/alizer-cli-${{ steps.get_version.outputs.version }}-${{ matrix.suffix }}
artifactContentType: application/zip
body: ${{ steps.changelog.outputs.changelog }}
name: ${{ steps.get_version.outputs.version }}
Expand Down
File renamed without changes.
13 changes: 7 additions & 6 deletions Jenkinsfile → java/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ node('rhel7'){
branch: "${sha1}"
}

stage('Build') {
sh "./mvnw verify"
}
dir('java') {
stage('Build') {
sh "./mvnw verify"
}

stage('Deploy') {
sh "./mvnw deploy"
stage('Deploy') {
sh "./mvnw deploy"
}
}

}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ The [prom-client](https://www.npmjs.com/package/prom-client) module will collect

## License

This stack is licensed under the [EPL 2.0](./LICENSE) license.
This stack is licensed under the [EPL 2.0](LICENSE) license.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7678de7

Please sign in to comment.