From 57805dafa4c86717c422e3f08402a3fac4ccad5e Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sat, 15 Feb 2025 20:51:56 +0530 Subject: [PATCH] chore: Use argos tokenless auth --- .github/workflows/e2e.yml | 5 ----- cypress.config.ts | 28 ++-------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e035ac710..1c0c6bbe0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -129,14 +129,9 @@ jobs: # e.g. if this action was run from a fork record: ${{ env.RUN_VISUAL_TEST == 'true' && secrets.CYPRESS_RECORD_KEY != '' }} env: - # Only set Argos environment variables if the visual test comment trigger is present - ARGOS_TOKEN: ${{ env.RUN_VISUAL_TEST == 'true' && secrets.ARGOS_TOKEN || '' }} ARGOS_PARALLEL: ${{ env.RUN_VISUAL_TEST == 'true' }} ARGOS_PARALLEL_TOTAL: ${{ env.RUN_VISUAL_TEST == 'true' && strategy.job-total || 1 }} ARGOS_PARALLEL_INDEX: ${{ env.RUN_VISUAL_TEST == 'true' && matrix.containers || 1 }} - GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_JOB: ${{ github.job }} - GITHUB_RUN_ID: ${{ github.run_id }} CYPRESS_COMMIT: ${{ github.sha }} CYPRESS_RECORD_KEY: ${{ env.RUN_VISUAL_TEST == 'true' && secrets.CYPRESS_RECORD_KEY || ''}} SPLIT: ${{ strategy.job-total }} diff --git a/cypress.config.ts b/cypress.config.ts index 247a21881..2adb52817 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -5,14 +5,6 @@ import { defineConfig } from 'cypress'; import { addMatchImageSnapshotPlugin } from 'cypress-image-snapshot/plugin'; import cypressSplit from 'cypress-split'; -const encodeArgosToken = (options: { - owner: string; - repository: string; - jobId: string; - runId: string; -}) => `tokenless-github-${Buffer.from(JSON.stringify(options), 'utf8').toString('base64')}`; -// cspell:ignore tokenless - export default eyesPlugin( defineConfig({ projectId: 'n2sma2', @@ -31,26 +23,10 @@ export default eyesPlugin( }); // copy any needed variables from process.env to config.env config.env.useAppli = process.env.USE_APPLI ? true : false; - config.env.useArgos = !!process.env.CI && !!process.env.ARGOS_TOKEN; + config.env.useArgos = !!process.env.CI; if (config.env.useArgos) { - if (!process.env.GITHUB_REPOSITORY) { - throw new Error('GITHUB_REPOSITORY is not set'); - } - if (!process.env.GITHUB_JOB) { - throw new Error('GITHUB_JOB is not set'); - } - if (!process.env.GITHUB_RUN_ID) { - throw new Error('GITHUB_RUN_ID is not set'); - } - registerArgosTask(on, config, { - token: encodeArgosToken({ - owner: process.env.GITHUB_REPOSITORY.split('/')[0], - repository: process.env.GITHUB_REPOSITORY.split('/')[1], - jobId: process.env.GITHUB_JOB, - runId: process.env.GITHUB_RUN_ID, - }), - }); + registerArgosTask(on, config); } else { addMatchImageSnapshotPlugin(on, config); }