From fddba97beb57ed33584cb4453d2edb3868796091 Mon Sep 17 00:00:00 2001 From: jeffgreiner-eaton Date: Tue, 10 Dec 2024 15:50:59 -0500 Subject: [PATCH] Update on merge firebase deploy --- .github/workflows/firebase-hosting-merge.yml | 10 +++++++++- .github/workflows/firebase-hosting-pull-request.yml | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 3cd5511d..73b8b7b8 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -6,12 +6,20 @@ on: push: branches: - master + +permissions: + pull-requests: write + contents: read + checks: write + jobs: build_and_deploy: runs-on: ubuntu-latest + env: + OKTA_APP_ISSUER: ${{secrets.OKTA_APP_ISSUER}} steps: - uses: actions/checkout@v4 - - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && yarn build + - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && echo "${{ secrets.OKTA_APP_ISSUER }}" > .env.local && yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: entryPoint: './login-workflow' diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 91e1025a..fffd1ff6 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -1,8 +1,5 @@ # This file was auto-generated by the Firebase CLI # https://github.com/firebase/firebase-tools -# Run - yarn firebase login -# Run - yarn firebase init hosting (new) -# Run - yarn firebase init hosting:github (only if hosting has previously been setup) name: Deploy to Firebase Hosting on PR @@ -22,9 +19,6 @@ jobs: steps: - uses: actions/checkout@v4 - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && echo "${{ secrets.OKTA_APP_ISSUER }}" > .env.local && yarn build - # - run: | - # cd login-workflow/example - # echo "${{ secrets.OKTA_APP_ISSUER }}" > .env.local - uses: FirebaseExtended/action-hosting-deploy@v0 with: entryPoint: './login-workflow'