Skip to content

Commit 98cc961

Browse files
authored
build: fix the CI on main (#3)
1 parent 9288c6a commit 98cc961

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/ci.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313

1414
jobs:
1515
frontend:
16+
if: github.event_name != 'push'
1617
runs-on: ubuntu-22.04
1718
permissions:
1819
contents: read
@@ -47,6 +48,7 @@ jobs:
4748

4849
test:
4950
runs-on: ubuntu-22.04
51+
if: github.event_name != 'push'
5052
steps:
5153
- name: Clone repository
5254
uses: actions/checkout@v4
@@ -90,7 +92,7 @@ jobs:
9092
working-directory: api
9193

9294
docker-images:
93-
if: github.event_name == 'merge_group' || github.ref == 'refs/heads/main'
95+
if: github.event_name == 'merge_group' || github.event_name == 'push'
9496
runs-on: ubuntu-22.04
9597
permissions:
9698
contents: read
@@ -155,7 +157,7 @@ jobs:
155157
run: echo "image_id=${{ env.FRONTEND_IMAGE_ID_BASE }}@${{ steps.frontend_push.outputs.imageid }}" >> $GITHUB_OUTPUT
156158

157159
staging:
158-
if: github.event_name == 'merge_group' || github.ref == 'refs/heads/main'
160+
if: github.event_name == 'merge_group'
159161
runs-on: ubuntu-22.04
160162
needs: docker-images
161163
environment:
@@ -204,7 +206,7 @@ jobs:
204206
run: deno task tf:staging:apply
205207

206208
prod:
207-
if: github.ref == 'refs/heads/main'
209+
if: github.event_name == 'push' || github.ref == 'refs/heads/main'
208210
runs-on: ubuntu-22.04
209211
needs: docker-images
210212
environment:

terraform_infra/artifact_registry.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resource "google_artifact_registry_repository" "registry" {
44
repository_id = "registry"
55
format = "DOCKER"
66
docker_config {
7-
immutable_tags = true
7+
immutable_tags = false
88
}
99
}
1010

0 commit comments

Comments
 (0)