From 4031c3b4ad0dfadac5b4c18d0145405e7d77d919 Mon Sep 17 00:00:00 2001 From: Josh Johanning Date: Wed, 6 Dec 2023 14:14:22 -0600 Subject: [PATCH 1/2] Update page.tsx --- app/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/page.tsx b/app/page.tsx index e396bc7..52a0b4e 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,7 +5,7 @@ export default function Home() {

- Get started by editing  + This is a PR!!!!   app/page.tsx

From b0155d5a400af0a670d30f43f4853f5c43a1f775 Mon Sep 17 00:00:00 2001 From: Josh Johanning Date: Thu, 7 Dec 2023 10:22:58 -0600 Subject: [PATCH 2/2] feat: simplify jobs in workflow --- .github/workflows/azure-static-web-app.yml | 30 ++-------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/azure-static-web-app.yml b/.github/workflows/azure-static-web-app.yml index 4be10a9..a1eb701 100644 --- a/.github/workflows/azure-static-web-app.yml +++ b/.github/workflows/azure-static-web-app.yml @@ -28,38 +28,12 @@ jobs: name: build path: output.tar.gz - deploy-pr: - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - needs: build - environment: - name: pr - url: ${{ steps.deploy.outputs.url }} - steps: - - name: download build artifact - uses: actions/download-artifact@v3 - with: - name: build - - name: extract output - run: tar -xzf output.tar.gz - - name: install swa cli - run: npm install -g @azure/static-web-apps-cli - - name: deploy app - id: deploy - run: | - # deploy site with swa - set -o pipefail - swa deploy ./out --deployment-token ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} \ - --env ${{ github.event_name == 'pull_request' && 'preview' || 'production' }} 2>&1 | tee deploy.log - url=$(grep 'Project deployed to' deploy.log | awk '{print $5}' | sed 's/\x1b\[[0-9;]*m//g') - echo "url=$url" >> "$GITHUB_OUTPUT" - - deploy-production: + deploy: if: github.event_name != 'pull_request' runs-on: ubuntu-latest needs: build environment: - name: dev + name: ${{ github.event_name == 'pull_request' && 'pr' || 'dev' }} url: ${{ steps.deploy.outputs.url }} steps: - name: download build artifact