From 16c6a92c53a7a23d0a489ee64614548c0da9db09 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 26 Apr 2026 22:33:05 +0100 Subject: [PATCH] ci(release): allow npm telegram e2e from release branch (cherry picked from commit 53f8e9de13118d37b47bc15cdc9d8c558fd9a2a1) --- .github/workflows/npm-telegram-beta-e2e.yml | 17 +---------------- test/scripts/npm-telegram-live.test.ts | 2 ++ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/npm-telegram-beta-e2e.yml b/.github/workflows/npm-telegram-beta-e2e.yml index 96eb43db14c..3f59dc69b73 100644 --- a/.github/workflows/npm-telegram-beta-e2e.yml +++ b/.github/workflows/npm-telegram-beta-e2e.yml @@ -34,23 +34,8 @@ env: PNPM_VERSION: "10.33.0" jobs: - validate_dispatch_ref: - name: Validate dispatch ref - runs-on: blacksmith-8vcpu-ubuntu-2404 - steps: - - name: Require main workflow ref - env: - WORKFLOW_REF: ${{ github.ref }} - run: | - set -euo pipefail - if [[ "${WORKFLOW_REF}" != "refs/heads/main" ]]; then - echo "NPM Telegram beta E2E must be dispatched from main so workflow logic stays controlled." >&2 - exit 1 - fi - approve_release_manager: name: Approve npm Telegram beta E2E - needs: validate_dispatch_ref runs-on: ubuntu-latest environment: npm-release steps: @@ -71,7 +56,7 @@ jobs: DOCKER_BUILD_SUMMARY: "false" DOCKER_BUILD_RECORD_UPLOAD: "false" steps: - - name: Checkout main + - name: Checkout dispatch ref uses: actions/checkout@v6 with: ref: ${{ github.sha }} diff --git a/test/scripts/npm-telegram-live.test.ts b/test/scripts/npm-telegram-live.test.ts index 7bd40f2cfe2..2a2bebc2d43 100644 --- a/test/scripts/npm-telegram-live.test.ts +++ b/test/scripts/npm-telegram-live.test.ts @@ -47,6 +47,8 @@ describe("npm Telegram live Docker E2E", () => { expect(workflow).toContain("approve_release_manager:"); expect(workflow).toContain("environment: npm-release"); expect(workflow).toContain("needs: approve_release_manager"); + expect(workflow).not.toContain("Require main workflow ref"); + expect(workflow).not.toContain("refs/heads/main"); expect(workflow).not.toContain('new Set(["admin", "write"])'); expect(workflow).not.toContain("data.role_name"); expect(workflow).not.toContain("github.rest.teams.listMembersInOrg");