3
3
on :
4
4
push :
5
5
branches :
6
- - master
7
6
- release/**
8
7
- release-library/**
9
8
@@ -19,6 +18,7 @@ concurrency:
19
18
env :
20
19
CARGO_TERM_COLOR : always
21
20
RELAY_CARGO_ARGS : " --locked"
21
+ IS_MASTER : " ${{ github.event_name == 'merge_group' }}"
22
22
23
23
jobs :
24
24
lint :
40
40
submodules : recursive
41
41
42
42
- name : Setup SSH agent
43
- if : ${{ env.SSH_PRIVATE_KEY != '' }}
43
+ if : env.SSH_PRIVATE_KEY != ''
44
44
uses : webfactory/ssh-agent@v0.9.0
45
45
with :
46
46
ssh-private-key : ${{ env.SSH_PRIVATE_KEY }}
@@ -130,7 +130,7 @@ jobs:
130
130
submodules : recursive
131
131
132
132
- name : Setup SSH agent
133
- if : ${{ env.SSH_PRIVATE_KEY != '' }}
133
+ if : env.SSH_PRIVATE_KEY != ''
134
134
# Windows needs an older versino of the ssh agent: https://github.com/webfactory/ssh-agent/pull/17
135
135
uses : webfactory/ssh-agent@v0.7.0
136
136
with :
@@ -184,7 +184,7 @@ jobs:
184
184
submodules : recursive
185
185
186
186
- name : Setup SSH agent
187
- if : ${{ env.SSH_PRIVATE_KEY != '' }}
187
+ if : env.SSH_PRIVATE_KEY != ''
188
188
uses : webfactory/ssh-agent@v0.9.0
189
189
with :
190
190
ssh-private-key : ${{ env.SSH_PRIVATE_KEY }}
@@ -473,7 +473,7 @@ jobs:
473
473
docker buildx build \
474
474
--platform "${PLATFORMS}" \
475
475
--tag "${DOCKER_IMAGE}:${REVISION}" \
476
- $( [[ "${GITHUB_REF }" == "refs/heads/master " ]] && printf %s "--tag ${DOCKER_IMAGE}:nightly" ) \
476
+ $( [[ "${IS_MASTER }" == "true " ]] && printf %s "--tag ${DOCKER_IMAGE}:nightly" ) \
477
477
--file Dockerfile.release \
478
478
--push \
479
479
.
@@ -557,7 +557,7 @@ jobs:
557
557
docker buildx build \
558
558
--platform "${PLATFORMS}" \
559
559
--tag "${AR_DOCKER_IMAGE}:${REVISION}" \
560
- $( [[ "${GITHUB_REF }" == "refs/heads/master " ]] && printf %s "--tag ${AR_DOCKER_IMAGE}:latest" ) \
560
+ $( [[ "${IS_MASTER }" == "true " ]] && printf %s "--tag ${AR_DOCKER_IMAGE}:latest" ) \
561
561
--file Dockerfile.release \
562
562
--push \
563
563
.
@@ -572,7 +572,7 @@ jobs:
572
572
matrix :
573
573
image_name : ["relay"] # Don't publish relay-pop (for now)
574
574
575
- if : ${{ ( github.ref_name == 'master') }}
575
+ if : github.event_name == 'merge_group'
576
576
577
577
env :
578
578
GHCR_DOCKER_IMAGE : " ghcr.io/getsentry/${{ matrix.image_name }}"
@@ -644,7 +644,7 @@ jobs:
644
644
run : docker buildx imagetools create --tag "${AR_DOCKER_IMAGE}:${REVISION}" "${GHCR_DOCKER_IMAGE}:${REVISION}"
645
645
646
646
- name : Copy Nightly from GHCR to AR
647
- if : github.ref == 'refs/heads/master '
647
+ if : env.IS_MASTER == 'true '
648
648
run : docker buildx imagetools create --tag "${AR_DOCKER_IMAGE}:nightly" "${GHCR_DOCKER_IMAGE}:nightly"
649
649
650
650
gocd-artifacts :
@@ -772,7 +772,7 @@ jobs:
772
772
key : ${{ github.job }}
773
773
774
774
- name : Setup SSH agent
775
- if : ${{ env.SSH_PRIVATE_KEY != '' }}
775
+ if : env.SSH_PRIVATE_KEY != ''
776
776
uses : webfactory/ssh-agent@v0.9.0
777
777
with :
778
778
ssh-private-key : ${{ env.SSH_PRIVATE_KEY }}
@@ -861,7 +861,7 @@ jobs:
861
861
validate-devservices-config :
862
862
runs-on : ubuntu-24.04
863
863
needs : devservices-files-changed
864
- if : ${{ needs.devservices-files-changed.outputs.devservices-files-changed == 'true' }}
864
+ if : needs.devservices-files-changed.outputs.devservices-files-changed == 'true'
865
865
steps :
866
866
- uses : actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
867
867
name : Checkout repository
0 commit comments