Skip to content

Commit

Permalink
Allow oc rollout cancel to fail on no rollouts
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts committed Jan 15, 2022
1 parent de2d5b9 commit 73ecb65
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
${{ runner.os }}-buildx-
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -47,7 +47,7 @@ jobs:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v2
with:
context: .
push: true
Expand All @@ -71,7 +71,7 @@ jobs:
oc project ${{ secrets.NAMESPACE }}
# Cancel any rollouts in progress
oc rollout cancel dc/gfp-${{ github.event.number }}
oc rollout cancel dc/gfp-${{ github.event.number }} || true
# Process and apply deployment template
oc process -f .pipeline/deploy.yml \
Expand Down

0 comments on commit 73ecb65

Please sign in to comment.