From 9922fc6fe003de8112ffc19dd4924d107cb857a0 Mon Sep 17 00:00:00 2001 From: Scott Alexander Date: Mon, 29 Jan 2024 21:20:53 +0000 Subject: [PATCH] removed references to envs before deploy steps on pre-prod sandbox test action --- .../workflows/base-cypress-test-all-env.yml | 37 +++++++++---------- .github/workflows/base-cypress-test.yml | 7 +--- .github/workflows/full-deploy-to-sandbox.yml | 2 +- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/.github/workflows/base-cypress-test-all-env.yml b/.github/workflows/base-cypress-test-all-env.yml index e28900952..7a32d4d91 100644 --- a/.github/workflows/base-cypress-test-all-env.yml +++ b/.github/workflows/base-cypress-test-all-env.yml @@ -1,13 +1,12 @@ -# .github/workflows/terraform-dev -name: 'Z-BASE Cypress Test: Run a cypress test job against all browsers' +name: "Z-BASE Cypress Test: Run a cypress test job against all browsers" on: workflow_call: inputs: build_branch: - description: 'Branch with smoke tests.' + description: "Branch to run against" required: true - type: 'string' + type: "string" permissions: pull-requests: write @@ -15,18 +14,18 @@ permissions: contents: read # This is required for actions/checkout jobs: - cypress_test_chrome: - uses: ./.github/workflows/base-cypress-test.yml - with: - build_branch: main - cypress_broswer: 'chrome' - cypress_test_edge: - uses: ./.github/workflows/base-cypress-test.yml - with: - build_branch: main - cypress_broswer: 'edge' - cypress_test_firefox: - uses: ./.github/workflows/base-cypress-test.yml - with: - build_branch: main - cypress_broswer: 'firefox' + cypress_test_chrome: + uses: ./.github/workflows/base-cypress-test.yml + with: + build_branch: ${{ github.event.inputs.build_branch }} + cypress_broswer: "chrome" + cypress_test_edge: + uses: ./.github/workflows/base-cypress-test.yml + with: + build_branch: ${{ github.event.inputs.build_branch }} + cypress_broswer: "edge" + cypress_test_firefox: + uses: ./.github/workflows/base-cypress-test.yml + with: + build_branch: ${{ github.event.inputs.build_branch }} + cypress_broswer: "firefox" diff --git a/.github/workflows/base-cypress-test.yml b/.github/workflows/base-cypress-test.yml index 13e187db0..b9290beab 100644 --- a/.github/workflows/base-cypress-test.yml +++ b/.github/workflows/base-cypress-test.yml @@ -17,11 +17,6 @@ on: description: 'what browser to run against' required: true type: 'string' - environment: - description: "Which Environment settings to use." - required: true - type: "string" - default: "development" permissions: pull-requests: write @@ -35,7 +30,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - ref: ${{ github.event.inputs.buildBranch }} + ref: ${{ github.event.inputs.build_branch }} - name: Download the build folder uses: actions/download-artifact@v3 diff --git a/.github/workflows/full-deploy-to-sandbox.yml b/.github/workflows/full-deploy-to-sandbox.yml index 4fddfd4a3..33b8cd24e 100644 --- a/.github/workflows/full-deploy-to-sandbox.yml +++ b/.github/workflows/full-deploy-to-sandbox.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: build_branch: - description: "Feature branch to push to test?" + description: "Feature branch to push?" required: true type: "string" default: "main"