Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bock4Soft committed Jul 5, 2024
2 parents 2e7f3c0 + 39b71d8 commit d76bbbb
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/maven-ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
- name: Deployment to Kubernetes
if: github.ref == 'refs/heads/develop'
run: |
Expand All @@ -74,5 +74,5 @@ jobs:
DOCKER_REGISTRY_USERNAME: dipa
DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
4 changes: 2 additions & 2 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<server>
<id>github</id>
<username>${env.GIT_HUB_USERNAME}</username>
<password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN}</password>
<password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE}</password>
</server>
<server>
<id>github-packages</id>
<username>${env.GIT_HUB_USERNAME}</username>
<password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN}</password>
<password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE}</password>
</server>
<server>
<id>docker.dipa.online</id>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>online.projektassistent</groupId>
<artifactId>projektassistent-parent</artifactId>
<version>0.0.10</version>
<version>0.0.12</version>
</parent>

<artifactId>projektassistent-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<groupId>online.projektassistent</groupId>
<artifactId>projektassistent-parent</artifactId>
<packaging>pom</packaging>
<version>0.0.10</version>
<version>0.0.12</version>
<name>Projektassistent :: Parent</name>
<description>Projektassistent</description>

Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>online.projektassistent</groupId>
<artifactId>projektassistent-parent</artifactId>
<version>0.0.10</version>
<version>0.0.12</version>
</parent>

<artifactId>projektassistent-server</artifactId>
Expand Down

0 comments on commit d76bbbb

Please sign in to comment.