From 154e0f994c64037d00d645060d097951a6ac13d6 Mon Sep 17 00:00:00 2001 From: navya9singh <108360753+navya9singh@users.noreply.github.com> Date: Wed, 24 Apr 2024 21:29:50 +0000 Subject: [PATCH 1/4] deploy to github pages --- .github/workflows/deploy-prod-static.yml | 43 +++++++++++++++++++----- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-prod-static.yml b/.github/workflows/deploy-prod-static.yml index 701a2ba4f24c..42a54160e419 100644 --- a/.github/workflows/deploy-prod-static.yml +++ b/.github/workflows/deploy-prod-static.yml @@ -9,6 +9,18 @@ on: # https://crontab.guru/#0_12_*_*_1 - cron: "0 12 * * 1" +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + jobs: build: runs-on: ubuntu-latest @@ -40,13 +52,26 @@ jobs: cp -r packages/typescriptlang-org/public site env: YARN_CHECKSUM_BEHAVIOR: ignore + + - name: Setup Pages + uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5 + if: github.event_name != 'pull_request' - - name: Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROD }} - repo_token: ${{ secrets.GITHUB_TOKEN }} - action: "upload" - app_location: "site" - skip_app_build: true + - name: Upload artifact + uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3 + if: github.event_name != 'pull_request' + with: + # Upload entire repository + path: '.' + + deploy: + if: github.event_name != 'pull_request' + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4 \ No newline at end of file From fd45540c8418781b280ec6d66e5691203f1fa088 Mon Sep 17 00:00:00 2001 From: navya9singh <108360753+navya9singh@users.noreply.github.com> Date: Wed, 24 Apr 2024 21:42:13 +0000 Subject: [PATCH 2/4] adressing pr comments --- .github/workflows/deploy-prod-static.yml | 31 +++++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-prod-static.yml b/.github/workflows/deploy-prod-static.yml index 42a54160e419..0a215c6b5541 100644 --- a/.github/workflows/deploy-prod-static.yml +++ b/.github/workflows/deploy-prod-static.yml @@ -52,26 +52,33 @@ jobs: cp -r packages/typescriptlang-org/public site env: YARN_CHECKSUM_BEHAVIOR: ignore + + - name: Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROD }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + action: "upload" + app_location: "site" + skip_app_build: true - name: Setup Pages uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5 - if: github.event_name != 'pull_request' - name: Upload artifact uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3 - if: github.event_name != 'pull_request' with: # Upload entire repository path: '.' deploy: - if: github.event_name != 'pull_request' - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4 \ No newline at end of file + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4 \ No newline at end of file From dd62e0cbde430097a94c3333a2dc9a6ea346c782 Mon Sep 17 00:00:00 2001 From: navya9singh <108360753+navya9singh@users.noreply.github.com> Date: Wed, 24 Apr 2024 21:55:42 +0000 Subject: [PATCH 3/4] fixing errors --- .github/workflows/deploy-prod-static.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-prod-static.yml b/.github/workflows/deploy-prod-static.yml index 0a215c6b5541..f15bcb5b888d 100644 --- a/.github/workflows/deploy-prod-static.yml +++ b/.github/workflows/deploy-prod-static.yml @@ -64,13 +64,13 @@ jobs: skip_app_build: true - name: Setup Pages - uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5 + uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5 - name: Upload artifact - uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3 + uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3 with: # Upload entire repository - path: '.' + path: './site' deploy: environment: From eac3edbbf1fc60889a97f7f33852f6b7f087c3f6 Mon Sep 17 00:00:00 2001 From: navya9singh <108360753+navya9singh@users.noreply.github.com> Date: Wed, 24 Apr 2024 22:00:12 +0000 Subject: [PATCH 4/4] Removing comment --- .github/workflows/deploy-prod-static.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-prod-static.yml b/.github/workflows/deploy-prod-static.yml index f15bcb5b888d..165bbcd2e841 100644 --- a/.github/workflows/deploy-prod-static.yml +++ b/.github/workflows/deploy-prod-static.yml @@ -69,7 +69,6 @@ jobs: - name: Upload artifact uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3 with: - # Upload entire repository path: './site' deploy: