diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef4d4f9fcf73..b0f150c21ff3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,24 +98,11 @@ jobs: plan: ${{ needs.plan.outputs.val }} secrets: inherit - custom-build-docker: - needs: - - plan - if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }} - uses: ./.github/workflows/build-docker.yml - with: - plan: ${{ needs.plan.outputs.val }} - secrets: inherit - permissions: - "contents": "read" - "packages": "write" - # Build and package all the platform-agnostic(ish) things build-global-artifacts: needs: - plan - custom-build-binaries - - custom-build-docker runs-on: "ubuntu-20.04" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -161,10 +148,9 @@ jobs: needs: - plan - custom-build-binaries - - custom-build-docker - build-global-artifacts # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine) - if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }} + if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: "ubuntu-20.04" diff --git a/Cargo.toml b/Cargo.toml index 5f5d6925e953..6d4e97001c5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -326,9 +326,7 @@ github-release = "announce" # Whether CI should include auto-generated code to build local artifacts build-local-artifacts = false # Local artifacts jobs to run in CI -local-artifacts-jobs = ["./build-binaries", "./build-docker"] -# Custom permissions for GitHub Jobs -github-custom-job-permissions = { "build-docker" = { packages = "write", contents = "read" } } +local-artifacts-jobs = ["./build-binaries"] # Whether to install an updater program install-updater = false # Path that installers should place binaries in