Skip to content

Commit be53798

Browse files
joshuarlijoshuarli
authored
Merge branch 'master' into devenv-and-pre-commit
2 parents 74ff9cd + 7f8435c commit be53798

File tree

145 files changed

+5070
-2096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+5070
-2096
lines changed

‎.github/actions/changelog/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ module.exports = async ({github, context, core}) => {
8888
}
8989

9090
// From: <https://develop.sentry.dev/engineering-practices/commit-messages/>.
91-
const TITLE_RE = /^(ci|build|docs|feat|fix|perf|ref|style|test|meta|license)(\([^)]+\))?: [A-Z].*\w$/;
91+
const TITLE_RE = /^(ci|build|docs|feat|fix|perf|ref|style|test|meta|license)(\([^)]+\))?: [A-Z].*[^,.]$/;
9292
const REVERT_RE = /^Revert ".*"$/;
9393

9494
if (pr.title.match(TITLE_RE) === null && pr.title.match(REVERT_RE) === null) {

‎.github/workflows/beta.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- 6379:6379
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
submodules: recursive
2828

‎.github/workflows/build_binary.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
apt-get update
2727
apt-get install -y --no-install-recommends git ca-certificates gcc libc6-dev curl make zip
2828
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
with:
3131
submodules: recursive
3232

@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ubuntu-22.04-arm
6767

6868
steps:
69-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
7070
with:
7171
submodules: recursive
7272

@@ -100,7 +100,7 @@ jobs:
100100
runs-on: macos-14
101101

102102
steps:
103-
- uses: actions/checkout@v4
103+
- uses: actions/checkout@v5
104104
with:
105105
submodules: recursive
106106

@@ -133,7 +133,7 @@ jobs:
133133
runs-on: windows-2022
134134

135135
steps:
136-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v5
137137
with:
138138
submodules: recursive
139139

‎.github/workflows/build_library.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
}')[matrix.build-arch] }}
2828
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
with:
3232
submodules: recursive
3333

@@ -58,7 +58,7 @@ jobs:
5858
runs-on: macos-14
5959

6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v5
6262
with:
6363
submodules: recursive
6464

@@ -100,7 +100,7 @@ jobs:
100100
runs-on: ubuntu-latest
101101

102102
steps:
103-
- uses: actions/checkout@v4
103+
- uses: actions/checkout@v5
104104
with:
105105
submodules: recursive
106106

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Changelogs
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
1414
env:
1515
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
sudo apt-get update
3636
sudo apt-get install -y libcurl4-openssl-dev
3737
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939
with:
4040
submodules: recursive
4141

@@ -106,7 +106,7 @@ jobs:
106106
sudo apt-get update
107107
sudo apt-get install -y libcurl4-openssl-dev
108108
109-
- uses: actions/checkout@v4
109+
- uses: actions/checkout@v5
110110
with:
111111
submodules: recursive
112112

@@ -127,7 +127,7 @@ jobs:
127127
outputs:
128128
devservices-files-changed: ${{ steps.changes.outputs.devservices-files-changed }}
129129
steps:
130-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
130+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.7
131131
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
132132
name: Check for file changes
133133
id: changes
@@ -156,7 +156,7 @@ jobs:
156156
if: "!startsWith(github.ref, 'refs/heads/release-library/')"
157157

158158
steps:
159-
- uses: actions/checkout@v4
159+
- uses: actions/checkout@v5
160160
with:
161161
submodules: recursive
162162

@@ -210,7 +210,7 @@ jobs:
210210
sudo apt-get update
211211
sudo apt-get install -y libcurl4-openssl-dev
212212
213-
- uses: actions/checkout@v4
213+
- uses: actions/checkout@v5
214214
with:
215215
submodules: recursive
216216

@@ -238,7 +238,7 @@ jobs:
238238
runs-on: ubuntu-latest
239239

240240
steps:
241-
- uses: actions/checkout@v4
241+
- uses: actions/checkout@v5
242242
with:
243243
submodules: recursive
244244

@@ -354,7 +354,7 @@ jobs:
354354
run: |
355355
curl -sL https://sentry.io/get-cli/ | bash
356356
357-
- uses: actions/checkout@v4
357+
- uses: actions/checkout@v5
358358
with:
359359
submodules: recursive
360360

@@ -430,7 +430,7 @@ jobs:
430430
run: |
431431
curl -sL https://sentry.io/get-cli/ | bash
432432
433-
- uses: actions/checkout@v4
433+
- uses: actions/checkout@v5
434434
with:
435435
submodules: recursive
436436

@@ -481,6 +481,10 @@ jobs:
481481
name: Build Docker Image
482482
runs-on: ubuntu-latest
483483

484+
permissions:
485+
contents: read
486+
packages: write
487+
484488
strategy:
485489
matrix:
486490
image_name: ${{ fromJson(needs.build-setup.outputs.image_names) }}
@@ -491,7 +495,7 @@ jobs:
491495
REVISION: "${{ github.event.pull_request.head.sha || github.sha }}"
492496

493497
steps:
494-
- uses: actions/checkout@v4
498+
- uses: actions/checkout@v5
495499

496500
- uses: docker/setup-qemu-action@v3
497501
- uses: docker/setup-buildx-action@v3
@@ -503,26 +507,28 @@ jobs:
503507

504508
- name: Build and push to ghcr.io
505509
if: "!github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]'"
506-
run: |
507-
docker login --username '${{ github.actor }}' --password '${{ secrets.GITHUB_TOKEN }}' ghcr.io
508-
509-
docker buildx build \
510-
--platform "${PLATFORMS}" \
511-
--tag "${DOCKER_IMAGE}:${REVISION}" \
512-
$( [[ "${IS_MASTER}" == "true" ]] && printf %s "--tag ${DOCKER_IMAGE}:nightly" ) \
513-
--file Dockerfile.release \
514-
--push \
515-
.
510+
uses: getsentry/action-build-and-push-images@4852d671d747d7c0268b2a3fc429fee9d4a16f78
511+
with:
512+
image_name: ${{ matrix.image_name }}
513+
platforms: ${{ env.PLATFORMS }}
514+
dockerfile_path: "./Dockerfile.release"
515+
ghcr: true
516+
tag_nightly: true
517+
tag_latest: true
518+
google_ar: false
519+
publish_on_pr: true
516520

517521
- name: Build and publish docker artifact
518522
if: "github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]'"
519-
run: |
520-
docker buildx build \
521-
--platform "${PLATFORMS}" \
522-
--tag "${DOCKER_IMAGE}:${REVISION}" \
523-
--file Dockerfile.release \
524-
--output type=docker,dest=${{ matrix.image_name }}-docker-image \
525-
.
523+
uses: getsentry/action-build-and-push-images@4852d671d747d7c0268b2a3fc429fee9d4a16f78
524+
with:
525+
image_name: ${{ matrix.image_name }}
526+
platforms: ${{ env.PLATFORMS }}
527+
dockerfile_path: "./Dockerfile.release"
528+
ghcr: false
529+
google_ar: false
530+
outputs: "type=docker,dest=${{ matrix.image_name }}-docker-image"
531+
tags: "ghcr.io/getsentry/${{ matrix.image_name }}:${{ github.event.pull_request.head.sha || github.sha }}"
526532

527533
- name: Upload docker image
528534
if: "github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]'"
@@ -555,7 +561,7 @@ jobs:
555561
if: "!startsWith(github.ref, 'refs/heads/release-library/') && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && needs.build-setup.outputs.full_ci == 'true'"
556562

557563
steps:
558-
- uses: actions/checkout@v4
564+
- uses: actions/checkout@v5
559565

560566
- uses: docker/setup-qemu-action@v3
561567
- uses: docker/setup-buildx-action@v3
@@ -589,48 +595,18 @@ jobs:
589595
done
590596
591597
- name: Build and push to Internal AR
592-
run: |
593-
docker buildx build \
594-
--platform "${PLATFORMS}" \
595-
--tag "${AR_DOCKER_IMAGE}:${REVISION}" \
596-
$( [[ "${IS_MASTER}" == "true" ]] && printf %s "--tag ${AR_DOCKER_IMAGE}:latest" ) \
597-
--file Dockerfile.release \
598-
--push \
599-
.
600-
601-
publish-to-dockerhub:
602-
needs: [build-setup, build-docker]
603-
604-
runs-on: ubuntu-22.04
605-
name: Publish Relay to DockerHub
606-
607-
strategy:
608-
matrix:
609-
image_name: ["relay"] # Don't publish relay-pop (for now)
610-
611-
if: github.event_name == 'merge_group'
612-
613-
env:
614-
GHCR_DOCKER_IMAGE: "ghcr.io/getsentry/${{ matrix.image_name }}"
615-
DH_DOCKER_IMAGE: "getsentry/${{ matrix.image_name }}"
616-
REVISION: "${{ github.event.pull_request.head.sha || github.sha }}"
617-
618-
steps:
619-
- name: Login to DockerHub
620-
run: docker login --username=sentrybuilder --password ${{ secrets.DOCKER_HUB_RW_TOKEN }}
621-
622-
- name: Copy Image from GHCR to DockerHub
623-
run: |
624-
# We push 3 tags to Dockerhub:
625-
# 1) the full sha of the commit
626-
docker buildx imagetools create --tag "${DH_DOCKER_IMAGE}:${REVISION}" "${GHCR_DOCKER_IMAGE}:${REVISION}"
627-
628-
# 2) the short sha
629-
SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-8)
630-
docker buildx imagetools create --tag "${DH_DOCKER_IMAGE}:${SHORT_SHA}" "${GHCR_DOCKER_IMAGE}:${REVISION}"
631-
632-
# 3) nightly
633-
docker buildx imagetools create --tag "${DH_DOCKER_IMAGE}:nightly" "${GHCR_DOCKER_IMAGE}:${REVISION}"
598+
uses: getsentry/action-build-and-push-images@4852d671d747d7c0268b2a3fc429fee9d4a16f78
599+
with:
600+
image_name: ${{ matrix.image_name }}
601+
platforms: ${{ env.PLATFORMS }}
602+
dockerfile_path: "./Dockerfile.release"
603+
ghcr: false
604+
publish_on_pr: true
605+
tag_latest: true
606+
google_ar: true
607+
google_ar_image_name: ${{ env.AR_DOCKER_IMAGE }}
608+
google_workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
609+
google_service_account: [email protected]
634610

635611
publish-to-gcr:
636612
timeout-minutes: 5
@@ -792,7 +768,7 @@ jobs:
792768
sudo apt-get update
793769
sudo apt-get install -y libcurl4-openssl-dev
794770
795-
- uses: actions/checkout@v4
771+
- uses: actions/checkout@v5
796772
with:
797773
submodules: recursive
798774

@@ -840,7 +816,7 @@ jobs:
840816
steps:
841817
# Checkout Sentry and run integration tests against latest Relay
842818
- name: Checkout Sentry
843-
uses: actions/checkout@v4
819+
uses: actions/checkout@v5
844820
with:
845821
repository: getsentry/sentry
846822
path: sentry

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
sudo apt-get update
2525
sudo apt-get install -y libcurl4-openssl-dev
2626
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
with:
2929
submodules: recursive
3030

@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555

5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858

5959
- name: Install Rust Toolchain
6060
run: rustup toolchain install stable --profile minimal --no-self-update

‎.github/workflows/release_binary.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2929
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
3030

31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
with:
3333
token: ${{ steps.token.outputs.token }}
3434
fetch-depth: 0

‎.github/workflows/release_library.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2424
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2525

26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
with:
2828
token: ${{ steps.token.outputs.token }}
2929
fetch-depth: 0

‎.github/workflows/validate-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
outputs:
1818
gocd: ${{ steps.changes.outputs.gocd }}
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Check for relevant file changes
2222
uses: getsentry/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
2323
id: changes
@@ -39,7 +39,7 @@ jobs:
3939
id-token: "write"
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
- id: 'auth'
4444
uses: google-github-actions/auth@v2
4545
with:

0 commit comments

Comments
 (0)