diff --git a/.github/workflows/release-branches.yml b/.github/workflows/release-branches.yml deleted file mode 100644 index 38e4044ed..000000000 --- a/.github/workflows/release-branches.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Release Branch - -concurrency: - group: release - -on: - push: - branches: - # NOTE: make sure any branches here are also valid directory names, - # otherwise creating the directory and uploading to s3 will fail - - "main" - -permissions: - id-token: "write" - contents: "read" - -jobs: - release-branch: - uses: ./.github/workflows/upload-release.yml - secrets: inherit diff --git a/.github/workflows/release-prs.yml b/.github/workflows/release-prs.yml deleted file mode 100644 index 818083c68..000000000 --- a/.github/workflows/release-prs.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Release PR - -concurrency: - group: release - -on: - pull_request: - types: - - opened - - reopened - - synchronize - - labeled - -permissions: - id-token: "write" - contents: "read" - -jobs: - release-pr: - # Only intra-repo PRs are allowed to have PR artifacts uploaded - # We only want to trigger once the upload once in the case the upload label is added, not when any label is added - if: | - always() && !failure() && !cancelled() - && github.event.pull_request.head.repo.full_name == 'DeterminateSystems/nix-priv' - && ( - (github.event.action == 'labeled' && github.event.label.name == 'upload to s3') - || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'upload to s3')) - ) - uses: ./.github/workflows/upload-release.yml - secrets: inherit diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml deleted file mode 100644 index 709fbb92a..000000000 --- a/.github/workflows/release-tags.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Release Tags - -concurrency: - group: release - -on: - push: - tags: - - "v*.*.*" - -permissions: - contents: write # In order to upload artifacts to GitHub releases - id-token: write # In order to request a JWT for AWS auth - -jobs: - release-tag: - uses: ./.github/workflows/upload-release.yml - secrets: inherit diff --git a/.github/workflows/upload-release.yml b/.github/workflows/upload-release.yml index bec5816be..cffbb315e 100644 --- a/.github/workflows/upload-release.yml +++ b/.github/workflows/upload-release.yml @@ -5,6 +5,19 @@ concurrency: on: workflow_call: + push: + branches: + # NOTE: make sure any branches here are also valid directory names, + # otherwise creating the directory and uploading to s3 will fail + - "main" + tags: + - "v*.*.*" + pull_request: + types: + - opened + - reopened + - synchronize + - labeled permissions: id-token: "write"