Skip to content

Commit

Permalink
chore: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandros Kalogerakis committed Oct 15, 2024
2 parents 60e4836 + 0cd6477 commit 3d5ec6c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/prd-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ jobs:
- uses: actions/checkout@v2
with:
repository: aeternity/gitops-apps.git
repository: aeternity/gitops-apps-aelabs.git
token: ${{ secrets.BOT_GITHUB_TOKEN }}
ref: prd
persist-credentials: false
fetch-depth: 0
Expand All @@ -105,6 +106,6 @@ jobs:
- name: Push changes
uses: ad-m/github-push-action@master
with:
repository: aeternity/gitops-apps
repository: aeternity/gitops-apps-aelabs
github_token: ${{ secrets.BOT_GITHUB_TOKEN }}
branch: prd
5 changes: 3 additions & 2 deletions .github/workflows/prd-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ jobs:
- uses: actions/checkout@v3
with:
repository: aeternity/gitops-apps.git
repository: aeternity/gitops-apps-aelabs.git
token: ${{ secrets.BOT_GITHUB_TOKEN }}
ref: prd
persist-credentials: false
fetch-depth: 0
Expand All @@ -112,6 +113,6 @@ jobs:
- name: Push changes
uses: ad-m/github-push-action@master
with:
repository: aeternity/gitops-apps
repository: aeternity/gitops-apps-aelabs
github_token: ${{ secrets.BOT_GITHUB_TOKEN }}
branch: prd

0 comments on commit 3d5ec6c

Please sign in to comment.