Skip to content

Commit 39ac2bb

Browse files
authored
Merge branch 'main' into vpcNames-without-route-controller
2 parents 9f9d016 + 509f22e commit 39ac2bb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
actions: read
1313

1414
concurrency:
15-
group: ci-${{ github.ref }}
15+
group: ci-${{ github.event.pull_request.number || github.ref_name }}
1616
cancel-in-progress: true
1717

1818
jobs:
@@ -103,16 +103,16 @@ jobs:
103103
steps:
104104
- uses: actions/[email protected]
105105
with:
106-
fetch-depth: 0
106+
ref: ${{ github.event.pull_request.head.sha }}
107107
- name: Docker Meta
108108
id: meta
109109
uses: docker/metadata-action@v5
110110
with:
111111
images: |
112112
linode/linode-cloud-controller-manager
113113
tags: |
114-
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
115-
type=semver,pattern={{raw}},value=${{ github.ref_name }}
114+
type=raw,value=pr-${{ github.event.pull_request.number }},enable=${{ github.event_name == 'pull_request_target' }}
115+
type=raw,value=latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
116116
- name: Build Dockerfile
117117
uses: docker/build-push-action@v6
118118
with:
@@ -131,7 +131,7 @@ jobs:
131131
env:
132132
GITHUB_TOKEN: ${{ secrets.github_token }}
133133
LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
134-
IMG: linode/linode-cloud-controller-manager:${{ github.ref == 'refs/heads/main' && 'latest' || format('pr-{0}', github.event.number) || github.ref_name }}
134+
IMG: linode/linode-cloud-controller-manager:${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && 'latest' || format('pr-{0}', github.event.pull_request.number) || github.ref_name }}
135135
LINODE_REGION: us-lax
136136
LINODE_CONTROL_PLANE_MACHINE_TYPE: g6-standard-2
137137
LINODE_MACHINE_TYPE: g6-standard-2

0 commit comments

Comments
 (0)