Skip to content

Commit a99a1e7

Browse files
authored
Revert "fix: Make CI works for external contributors (#503)"
This reverts commit 836026f.
1 parent 836026f commit a99a1e7

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

.github/workflows/image.yml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,17 @@ jobs:
2828
platforms: linux/${{ matrix.platform }}
2929
dockerfile_path: './Dockerfile'
3030
build_args: TASKBROKER_GIT_REVISION=${{ github.sha }}
31-
ghcr: ${{ github.event.pull_request.head.repo.fork == false }}
31+
ghcr: true
3232
tag_suffix: -${{ matrix.platform }}
3333
publish_on_pr: true
3434
google_ar: false
3535
tag_nightly: false
3636
tag_latest: false
37-
tags: ${{ github.event_name == 'pull_request' && 'ghcr.io/getsentry/taskbroker:nightly' || ''}}
38-
outputs: ${{ github.event_name == 'pull_request' && 'type=docker' || ''}}
39-
40-
- name: Save Docker image to artifact
41-
if: ${{ github.event_name == 'pull_request' }}
42-
run: docker save -o /tmp/taskbroker.tar ghcr.io/getsentry/taskbroker:nightly
43-
44-
- name: Upload artifact for self-hosted e2e
45-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
46-
if: ${{ github.event_name == 'pull_request' }}
47-
with:
48-
name: taskbroker-${{ matrix.platform }}
49-
path: /tmp/taskbroker.tar
50-
if-no-files-found: error
51-
retention-days: 1
5237

5338
assemble-taskbroker-image:
5439
runs-on: ubuntu-latest
5540
needs: [build]
41+
if: ${{ (github.ref_name == 'main' || startsWith(github.ref_name, 'releases/')) && github.event_name != 'pull_request' }}
5642
permissions:
5743
contents: read
5844
packages: write
@@ -67,7 +53,6 @@ jobs:
6753
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
6854

6955
- name: Create multiplatform manifests
70-
if: ${{ (github.ref_name == 'main' || startsWith(github.ref_name, 'releases/')) && github.event_name != 'pull_request' }}
7156
run: |
7257
docker buildx imagetools create \
7358
--tag ghcr.io/getsentry/taskbroker:${{ github.event.pull_request.head.sha || github.sha }} \
@@ -106,19 +91,6 @@ jobs:
10691
timeout-minutes: 30
10792

10893
steps:
109-
- name: Download artifact for pull request
110-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
111-
if: ${{ github.event_name == 'pull_request' }}
112-
with:
113-
name: taskbroker-amd64
114-
path: /tmp/
115-
116-
- name: Load Docker image from tar file
117-
if: ${{ github.event_name == 'pull_request' }}
118-
run: |
119-
docker image load --input /tmp/taskbroker.tar
120-
docker image tag ghcr.io/getsentry/taskbroker:nightly ghcr.io/getsentry/taskbroker:${{ github.sha }}
121-
12294
- name: Run Sentry self-hosted e2e CI
12395
uses: getsentry/self-hosted@master
12496
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# recent enough version of protobuf-compiler
44
FROM rust:1-bookworm AS build
55

6-
RUN apt-get update && apt-get upgrade -y
6+
RUN apt-get update && apt-get upgrade -y
77
RUN apt-get install -y cmake pkg-config libssl-dev librdkafka-dev protobuf-compiler
88

99
RUN USER=root cargo new --bin taskbroker

0 commit comments

Comments
 (0)