Skip to content

Commit 0ab8995

Browse files
committed
Fix ci & doc workflow push/release condition
1 parent f5b5d9f commit 0ab8995

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
packages: write
249249

250250
env:
251-
PUSH_PACKAGES: ${{ github.event.action == 'closed' && github.event.pull_request.merged == true && (github.base_ref == 'refs/heads/main' || startsWith('refs/heads/hotfix', github.base_ref)) }}
251+
PUSH_PACKAGES: ${{ github.event.action == 'closed' && github.event.pull_request.merged == true && (github.base_ref == 'main' || startsWith('hotfix', github.base_ref)) }}
252252
REGISTRY: ghcr.io
253253
IMAGE_NAME: ${{ github.repository_owner }}/${{ matrix.project }}
254254
DOCKER_FILE: ./${{ matrix.project }}/Dockerfile.ci
@@ -272,7 +272,7 @@ jobs:
272272
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
273273
tags: |
274274
unstable
275-
type=raw,value={{base_ref}}-{{sha}}
275+
type=raw,value=${{ github.base_ref }}-{{sha}}
276276
277277
- name: Download built artifacts
278278
uses: actions/download-artifact@v3
@@ -289,7 +289,7 @@ jobs:
289289
tags: ${{ steps.meta.outputs.tags }}
290290

291291
unstable-release:
292-
if: github.event.action == 'closed' && github.event.pull_request.merged == true && (github.base_ref == 'refs/heads/main' || startsWith('refs/heads/hotfix', github.base_ref))
292+
if: github.event.action == 'closed' && github.event.pull_request.merged == true && (github.base_ref == 'main' || startsWith('hotfix', github.base_ref))
293293
runs-on: ubuntu-22.04
294294
needs:
295295
- build
@@ -458,7 +458,7 @@ jobs:
458458
GOOGLE_APPLICATION_CREDENTIALS=./google-application-credentials.json terraform plan --var-file=./env.variables.tfvars
459459
460460
- name: Terraform Apply
461-
if: github.event.action == 'closed' && github.event.pull_request.merged == true && github.base_ref == 'refs/heads/main'
461+
if: github.event.action == 'closed' && github.event.pull_request.merged == true && github.base_ref == 'main'
462462
run: |
463463
GOOGLE_APPLICATION_CREDENTIALS=./google-application-credentials.json terraform apply -auto-approve --var-file=./env.variables.tfvars
464464

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
out/*
117117
118118
publish-docs:
119-
if: github.event.action == 'closed' && github.event.pull_request.merged == true && github.base_ref == 'refs/heads/main'
119+
if: github.event.action == 'closed' && github.event.pull_request.merged == true && github.base_ref == 'main'
120120
runs-on: ubuntu-22.04
121121
needs:
122122
- cargo-doc

0 commit comments

Comments
 (0)