Skip to content

Commit

Permalink
Merge branch 'master' of github.com:robocup-logistics/rcll-mqtt-bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
pkohout committed Apr 23, 2024
2 parents 2366e09 + 50393fc commit 654e946
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:

build:

environment: publishing
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gradle-publish-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
with:
arguments: publishAllPublicationsToGitHubPackagesRepository
env:
JAVA_SDK_USERNAME: ${{ env.JAVA_SDK_USERNAME }}
GHP_JAVA_SDK_TOKEN: ${{ secrets.GHP_JAVA_SDK_TOKEN }}
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
SIGNINGKEYID: ${{ secrets.SIGNINGKEYID }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
build:

environment: publishing
runs-on: ubuntu-latest

steps:
Expand All @@ -29,6 +29,9 @@ jobs:
java-version: '11'
distribution: 'temurin'
- name: Build with Gradle
env:
JAVA_SDK_USERNAME: ${{ env.USERNAME }}
GHP_JAVA_SDK_TOKEN: ${{ secrets.GHP_JAVA_SDK_TOKEN }}
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
with:
arguments: build
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
ARG JAVA_SDK_USERNAME
ARG GHP_JAVA_SDK_TOKEN
FROM gradle:7.6-jdk11-alpine AS build
ENV GHP_JAVA_SDK_TOKEN $GHP_JAVA_SDK_TOKEN
ENV JAVA_SDK_USERNAME $JAVA_SDK_USERNAME
COPY --chown=gradle:gradle . /home/gradle/src
WORKDIR /home/gradle/src
RUN gradle build --no-daemon
Expand Down
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,19 @@ Payloads:

![prepare_DS](https://github.com/robocup-logistics/rcll-mqtt-bridge/assets/5959988/78f53e2c-7ff7-4c9a-80a5-4f140290e017)

#### Report machine as explored
Topic: `<TEAM>/report`
Payload:
`{
"machine": <FULL_MACHINE_NAME>,
"x": <X_COORDINATE>,
"y": <Y_COORDINATE>,
"yaw": <YAW>
}`
![correct_report](https://github.com/robocup-logistics/rcll-mqtt-bridge/assets/5959988/ac4db093-ea2a-4465-95d1-a8166e627808)
![wrong_report](https://github.com/robocup-logistics/rcll-mqtt-bridge/assets/5959988/ee111bd6-25fd-4b51-9adb-bf04573d11d8)

### Missing Features

- Publishing Robot Beacon Signals
- Keep track of game state. Like once a Cap Station was prepared remember that this was done, then we could publish a more strong game state which does not need to be kept in the teams planning implementation but can be handled here.

### Missing Features
tion was prepared remember that this was done, then we could publish a more strong game state which does not need to be kept in the teams planning implementation but can be handled here.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ repositories {
maven {
url = uri("https://maven.pkg.github.com/robocup-logistics/rcll-java")
credentials {
username = System.getenv("USERNAME")
password = System.getenv("TOKEN")
username = project.findProperty("gprUser") != "" ? project.findProperty("gprUser") : System.getenv("JAVA_SDK_USERNAME")
password = project. findProperty("gprToken") != "" ? project.findProperty("gprToken"): System.getenv("GHP_JAVA_SDK_TOKEN")
}
}
}
Expand Down

0 comments on commit 654e946

Please sign in to comment.