Skip to content

Commit

Permalink
Fix the proto Include paths
Browse files Browse the repository at this point in the history
The generated code needs to be in the `uprotocol` namespace folder structure for clarity however the protos root was the uprotocol folder so generated code was missing the uprotocol folder. This change fixes the protos and cleans up the build to still work and validate the build/changes.

#161
  • Loading branch information
czfdcn authored and gregmedd committed May 23, 2024
1 parent dee1280 commit 78e563e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-github-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: mvn -B package --file up-core-api/pom.xml

- name: Publish maven package to GitHub Packages
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file up-core-api/pom.xml
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file pom.xml
env:
# GITHUB_TOKEN: ${{ github.token }}
GITHUB_TOKEN: ${{ secrets.PKG_PUSH_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Build and Test with Maven
run: mvn -B package --file up-core-api/pom.xml
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion .github/workflows/build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
gpg-passphrase: GPG_PASSPHRASE

- name: Build and Publish to Apache Maven Central
run: mvn clean deploy --file up-core-api/pom.xml
run: mvn clean deploy --file pom.xml
env:
OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- name: Stage to Nexus and Release to Maven central
run: |
mvn -B release:clean release:prepare -P release release:perform --file up-core-api/pom.xml
mvn -B release:clean release:prepare -P release release:perform --file pom.xml
env:
OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
Expand All @@ -44,7 +44,7 @@ jobs:

- if: cancelled() || failure()
run: |
mvn -B release:rollback --file up-core-api/pom.xml
mvn -B release:rollback --file pom.xml
env:
GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/uprotocol-spec.iml
/up-spec.iml
/up-core-api/target/
/target/
File renamed without changes.

0 comments on commit 78e563e

Please sign in to comment.