diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 675cf58..ae1e63f 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -3,16 +3,18 @@ name: Cross Browser End-to-End Testing (Cypress) 🚀 on: push: branches: - - main + - '**' pull_request: - types: [opened, synchronize, reopened] + branches: + - '**' + types: [opened, reopened, synchronize] schedule: - cron: '0 2 * * FRI' jobs: cypress-run: runs-on: ubuntu-latest - timeout-minutes: 5 + timeout-minutes: 30 services: docker: @@ -26,21 +28,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Create Docker secrets - run: | - echo ${{ secrets.CYPRESS_RECORD_KEY }} | docker secret create cypress_record_key - - echo ${{ secrets.GITHUB_TOKEN }} | docker secret create github_token - - - name: Build and run Docker Compose 🐳 env: NODE_ENV: production NEXT_PUBLIC_REKOR_DEFAULT_DOMAIN: https://rekor.sigstore.dev + CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: docker-compose up --build -d - name: Wait for services to start ⏱️ diff --git a/docker-compose.yaml b/docker-compose.yaml index 49f448a..d4cce32 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,22 +19,11 @@ services: NEXT_PUBLIC_REKOR_DEFAULT_DOMAIN: https://rekor.sigstore.dev depends_on: - nextjs - secrets: - - source: cypress_record_key - target: cypress_record_key - - source: github_token - target: github_token volumes: - ./artifacts/electron/videos:/e2e/cypress/videos - ./artifacts/electron/screenshots:/e2e/cypress/screenshots environment: - CYPRESS_BASE_URL=http://nextjs:3000 - - CYPRESS_RECORD_KEY_FILE=/run/secrets/cypress_record_key - - GITHUB_TOKEN_FILE=/run/secrets/github_token + - CYPRESS_RECORD_KEY=${CYPRESS_RECORD_KEY} + - GITHUB_TOKEN=${GITHUB_TOKEN} command: npx cypress run - -secrets: - cypress_record_key: - external: true - github_token: - external: true