diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index bdc1c30..14d06ad 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,7 +17,6 @@ on: required: false default: us-west-2 - workflow_call: inputs: environment: @@ -41,6 +40,14 @@ jobs: PERMISSIONS_BOUNDARY_ARN: ${{ vars.PERMISSIONS_BOUNDARY_ARN }} PROJECT_NAME: ${{ vars.PROJECT_NAME }} HONEYCOMB_API_KEY: ${{ secrets.HONEYCOMB_API_KEY }} + GH_OAUTH_SECRET_NAME: ${{ vars.GH_OAUTH_SECRET_NAME }} + GH_ALLOWED_ORGS: ${{ vars.GH_ALLOWED_ORGS }} + GH_ADMIN_GROUP: ${{ vars.GH_ADMIN_GROUP }} + GH_EDITOR_GROUP: ${{ vars.GH_EDITOR_GROUP }} + GRAFANA_DOMAIN_NAME: ${{ vars.GRAFANA_DOMAIN_NAME }} + GRAFANA_CERTIFICATE_ARN: ${{ vars.GRAFANA_CERTIFICATE_ARN }} + CLOUDFRONT_CERTIFICATE_ARN: ${{ vars.CLOUDFRONT_CERTIFICATE_ARN }} + steps: - name: Checkout @@ -51,8 +58,7 @@ jobs: with: python-version: "3.11" cache: "pip" - - - run: pip install -r requirements.txt + run: pip install -r requirements.txt - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 0924c88..87e5e7f 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -9,10 +9,6 @@ jobs: id: define_environment run: | if [ "${{ github.ref_name }}" == "main" ]; then - echo "env_name=staging" >> $GITHUB_OUTPUT - elif [ "${{ github.ref_name }}" == "dev" ]; then - echo "env_name=development" >> $GITHUB_OUTPUT - elif [ "${{ github.ref_name }}" == "production" ]; then echo "env_name=production" >> $GITHUB_OUTPUT else echo "No environment associated with ${GITHUB_REF##*/} branch"