Skip to content

chore: add force option when merge #101

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

Merged
mulmuri merged 1 commit into from
Feb 20, 2025
Merged

chore: add force option when merge #101

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/actions/update-image-tag/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ runs:
- name: "Merge pull request"
if: steps.pull-request.outputs.pull-request-operation == 'created'
shell: bash
run: gh pr merge ${{ steps.pull-request.outputs.pull-request-number }} --squash --delete-branch --repo goboolean/manifests
run: gh pr merge ${{ steps.pull-request.outputs.pull-request-number }} --squash --delete-branch --force --repo goboolean/manifests
env:
GITHUB_TOKEN: ${{ inputs.github-token }}
6 changes: 3 additions & 3 deletions fetch-system.polygon-proxy/kustomize/overlays/dev/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
namespace: fetch-system

resources:
- ../../base
- service-account.yaml
- init-script.yaml
- ../../base
- service-account.yaml
- init-script.yaml

patchesStrategicMerge:
- path: deployment.yaml
2 changes: 1 addition & 1 deletion fetch-system.streams/kustomize/base/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
containers:
- name: streams
image: "registry.goboolean.io/fetch-system/streams:prod-latest"
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
env:
- name: KAFKA_BOOTSTRAP_SERVERS
value: ""
Expand Down
2 changes: 1 addition & 1 deletion fetch-system.util/kustomize/base/db-initer-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
containers:
- name: db-initer
image: "registry.goboolean.io/fetch-system/util/db-initer:prod-latest"
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
env:
- name: POSTGRES_HOST
value: ""
Expand Down
2 changes: 1 addition & 1 deletion fetch-system.worker/kustomize/base/kis-stock-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
containers:
- name: kis-stock
image: "registry.goboolean.io/fetch-system/worker:prod-latest"
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
env:
- name: KIS_APP_KEY
value: ""
Expand Down
2 changes: 1 addition & 1 deletion fetch-system.worker/kustomize/base/polygon-stock-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
containers:
- name: polygon-stock
image: "registry.goboolean.io/fetch-system/worker:prod-latest"
imagePullPolicy: Always
imagePullPolicy: IfNotPresent
env:
- name: POLYGON_SECRET_KEY
value: ""
Expand Down