Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/actions/build-binary-package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,10 @@ inputs:
arch:
description: "Architecture to build for"
required: true
checkout_ref:
description: "Ref to checkout"
required: false
default: ''

runs:
using: "composite"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.checkout_ref || '' }}
- name: Determine build architecture
shell: bash
run: |
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/build-source-package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@ inputs:
release_tag:
description: "Release tag to build for (value 'unstable' is supported)"
required: false
checkout_ref:
description: "Ref to checkout"
required: false
default: ''

runs:
using: "composite"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.checkout_ref || '' }}
- name: Install dependencies
shell: bash
run: |
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/run-smoke-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,10 @@ inputs:
arch:
description: "Architecture to run smoke tests for"
required: true
checkout_ref:
description: "Ref to checkout"
required: false
default: ''

runs:
using: "composite"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.checkout_ref || '' }}
- name: Extract distribution from image
id: extract_dist
shell: bash
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/build-n-test-all-distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
with:
dist: ${{ matrix.dist }}
release_tag: ${{ inputs.release_tag }}
checkout_ref: ${{ inputs.release_tag == 'unstable' && 'unstable' || '' }}

build-binary-package:
runs-on: ${{ contains(matrix.arch, 'arm') && 'ubuntu24-arm64-2-8' || 'ubuntu-24.04' }}
Expand Down Expand Up @@ -78,7 +77,6 @@ jobs:
dist: ${{ matrix.dist }}
arch: ${{ matrix.arch }}
run_id: ${{ github.run_id }}
checkout_ref: ${{ inputs.release_tag == 'unstable' && 'unstable' || '' }}

smoke-test-archs:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -115,4 +113,3 @@ jobs:
image: ${{ matrix.image }}
arch: ${{ matrix.arch }}
run_id: ${{ github.run_id }}
checkout_ref: ${{ inputs.release_tag == 'unstable' && 'unstable' || '' }}
8 changes: 5 additions & 3 deletions .github/workflows/release_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,19 @@ jobs:
with:
release_handle: ${{ github.event.inputs.release_handle }}

- name: Upload staging packages
- name: Upload packages
id: upload
uses: ./.github/actions/upload-packages
with:
run_id: ${{ steps.parse-handle.outputs.run_id }}
release_type: ${{ github.event.inputs.release_type }}
gh_token: ${{ secrets.GITHUB_TOKEN }}
APT_SIGNING_KEY: ${{ secrets.APT_SIGNING_KEY }}
APT_S3_BUCKET: ${{ secrets.APT_S3_BUCKET_STAGING }}
APT_S3_REGION: ${{ secrets.APT_S3_REGION }}
APT_S3_IAM_ARN: ${{ secrets.APT_S3_IAM_ARN_STAGING }}
APT_S3_BUCKET: ${{ github.event.inputs.release_type == 'public' && secrets.APT_S3_BUCKET || secrets.APT_S3_BUCKET_STAGING }}
APT_S3_IAM_ARN: ${{ github.event.inputs.release_type == 'internal' && secrets.APT_S3_IAM_ARN_STAGING || '' }}
APT_S3_ACCESS_KEY_ID: ${{ github.event.inputs.release_type == 'public' && secrets.APT_S3_ACCESS_KEY_ID || '' }}
APT_S3_SECRET_ACCESS_KEY: ${{ github.event.inputs.release_type == 'public' && secrets.APT_S3_SECRET_ACCESS_KEY || '' }}

- name: Merge back to release branch
id: merge-back
Expand Down
Loading