diff --git a/.forgejo/workflows/apple-distribute-testers.yml b/.forgejo/workflows/apple-distribute-testers.yml index aed30e0..8a0fd57 100644 --- a/.forgejo/workflows/apple-distribute-testers.yml +++ b/.forgejo/workflows/apple-distribute-testers.yml @@ -84,7 +84,7 @@ env: jobs: prepare: name: Prepare Apple Distribution - runs-on: namespace-profile-linux-medium-apple + runs-on: namespace-profile-linux-medium-apple-v2 outputs: build_number: ${{ steps.plan.outputs.build_number }} sparkle_channel: ${{ steps.plan.outputs.sparkle_channel }} @@ -123,7 +123,7 @@ jobs: build-ios: name: Build Apple iOS needs: prepare - runs-on: namespace-profile-macos-large-apple + runs-on: namespace-profile-macos-large-apple-v2 steps: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 @@ -219,7 +219,7 @@ jobs: build-macos: name: Build Apple macOS needs: prepare - runs-on: namespace-profile-macos-large-apple + runs-on: namespace-profile-macos-large-apple-v2 steps: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 @@ -319,7 +319,7 @@ jobs: - prepare - build-ios - build-macos - runs-on: namespace-profile-linux-medium-apple + runs-on: namespace-profile-linux-medium-apple-v2 steps: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 @@ -398,7 +398,7 @@ jobs: - prepare - sign-apple if: ${{ github.event.inputs.upload_app_store == 'true' }} - runs-on: namespace-profile-macos-large-apple + runs-on: namespace-profile-macos-large-apple-v2 steps: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 @@ -501,7 +501,7 @@ jobs: - prepare - sign-apple if: ${{ github.event.inputs.upload_sparkle == 'true' }} - runs-on: namespace-profile-linux-medium-apple + runs-on: namespace-profile-linux-medium-apple-v2 steps: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 diff --git a/evolution/proposals/BEP-0009-release-infrastructure-and-store-upload-pipeline.md b/evolution/proposals/BEP-0009-release-infrastructure-and-store-upload-pipeline.md index e95e0b9..bd96f2e 100644 --- a/evolution/proposals/BEP-0009-release-infrastructure-and-store-upload-pipeline.md +++ b/evolution/proposals/BEP-0009-release-infrastructure-and-store-upload-pipeline.md @@ -105,8 +105,10 @@ The same change also makes the forge itself the release authority: release tags - `namespace-profile-windows-large` - Use dedicated Apple distribution labels for the focused tester-distribution workflow so stale generic Namespace jobs cannot consume Apple release runners: - - `namespace-profile-linux-medium-apple` - - `namespace-profile-macos-large-apple` + - `namespace-profile-linux-medium-apple-v2` + - `namespace-profile-macos-large-apple-v2` + Label revisions are allowed when earlier accepted workflows have stale + queued jobs; the autoscaler should serve only the current focused label set. - Configure macOS Namespace targets with the Compute API CPU-by-memory shape format. `12x28` is the Burrow large macOS baseline; platform-prefixed values such as `macos/arm64:8x16` are not accepted by the macOS launcher. diff --git a/secrets/infra/forgejo-nsc-autoscaler-config.age b/secrets/infra/forgejo-nsc-autoscaler-config.age index 13ec114..89c1e81 100644 Binary files a/secrets/infra/forgejo-nsc-autoscaler-config.age and b/secrets/infra/forgejo-nsc-autoscaler-config.age differ diff --git a/secrets/infra/forgejo-nsc-dispatcher-config.age b/secrets/infra/forgejo-nsc-dispatcher-config.age index fe55233..c45bdc7 100644 Binary files a/secrets/infra/forgejo-nsc-dispatcher-config.age and b/secrets/infra/forgejo-nsc-dispatcher-config.age differ diff --git a/secrets/infra/forgejo-nsc-token.age b/secrets/infra/forgejo-nsc-token.age index c018ce4..0a7a468 100644 Binary files a/secrets/infra/forgejo-nsc-token.age and b/secrets/infra/forgejo-nsc-token.age differ diff --git a/services/forgejo-nsc/deploy/autoscaler.yaml b/services/forgejo-nsc/deploy/autoscaler.yaml index cd39e05..4524676 100644 --- a/services/forgejo-nsc/deploy/autoscaler.yaml +++ b/services/forgejo-nsc/deploy/autoscaler.yaml @@ -26,7 +26,7 @@ instances: min_idle: 0 ttl: "20m" machine_type: "8x16" - - labels: ["namespace-profile-linux-medium-apple"] + - labels: ["namespace-profile-linux-medium-apple-v2"] min_idle: 0 ttl: "30m" machine_type: "8x16" @@ -34,7 +34,7 @@ instances: min_idle: 0 ttl: "60m" machine_type: "12x28" - - labels: ["namespace-profile-macos-large-apple"] + - labels: ["namespace-profile-macos-large-apple-v2"] min_idle: 0 ttl: "90m" machine_type: "12x28"