Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Workflow #181

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Update Workflow #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/auto-merge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ jobs:
needs: auto_merge
runs-on: ubuntu-latest
steps:
- name: Debugging
run: |
echo "PR Number: ${{ needs.auto_merge.outputs.pr_number }}"
echo "Head Ref: ${{ needs.auto_merge.outputs.pr_head_ref }}"

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -112,7 +117,7 @@ jobs:
git branch --set-upstream-to=origin/staging staging
git rebase main
#Accept Changes From main
git checkout --ours charts/values.yaml
git checkout --ours ./charts/values.yaml
git add charts/values.yaml
git rebase --continue
git push origin staging --force
Expand Down
Loading