full-scale revision to earlier point in history. need to see if this …

…is a systematic breakage, or there's something else going on.
Smithsonian · Sep 4, 2024 · 6fa404e · 6fa404e
1 parent 04adc96
commit 6fa404e
Showing 1 changed file with 7 additions and 63 deletions.
diff --git a/.github/workflows/main-forestgeo-livesite.yml b/.github/workflows/main-forestgeo-livesite.yml
@@ -31,6 +31,7 @@ jobs:
           echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
           echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
           echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
+          echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env
           echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
           echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env
           echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
@@ -42,20 +43,18 @@ jobs:
           echo AZURE_SQL_SCHEMA=${{ secrets.AZURE_SQL_SCHEMA }} >> frontend/.env
           echo AZURE_SQL_CATALOG_SCHEMA=${{ secrets.AZURE_SQL_CATALOG_SCHEMA }} >> frontend/.env
           echo AZURE_STORAGE_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} >> frontend/.env
-          echo NODE_ENV=production >> frontend/.env
+          echo NODE_ENV=development >> frontend/.env
           echo PORT=3000 >> frontend/.env
-          echo FG_PAT=${{ secrets.FG_PAT }} >> frontend/.env
-          echo OWNER=${{ secrets.OWNER }} >> frontend/.env
-          echo REPO=${{ secrets.REPO }} >> frontend/.env
 
       - name: create env file (in frontend/ directory) -- development
         id: create-env-file-dev
         if: startsWith(github.ref, 'refs/heads/forestgeo-app-')
         run: |
           touch frontend/.env
-          echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
-          echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
-          echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
+          echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_SECRET }} >> frontend/.env
+          echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_ID }} >> frontend/.env
+          echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_TENANT_ID }} >> frontend/.env
+          echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env
           echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
           echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_DEV_URL }} >> frontend/.env
           echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
@@ -151,59 +150,4 @@ jobs:
           app-name: 'forestgeo-livesite'
           slot-name: 'development'
           publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DEVELOPMENT }}
-          package: ./frontend/build/standalone
-
-  build-docs-deploy-docs:
-    permissions:
-      id-token: write
-      pages: write
-
-    env:
-      INSTANCE: 'documentation/fad'
-      ARTIFACT: 'webHelpFAD2-all.zip'
-      DOCKER_VERSION: '241.18775'
-    runs-on: ubuntu-latest
-    needs: deploy-app
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build docs using Writerside Docker builder
-        uses: JetBrains/writerside-github-action@v4
-        with:
-          instance: ${{ env.INSTANCE }}
-          artifact: ${{ env.ARTIFACT }}
-          docker-version: ${{ env.DOCKER_VERSION }}
-
-      - name: Upload documentation artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: docs
-          path: |
-            artifacts/${{ env.ARTIFACT }}
-            artifacts/report.json  # Ensure report.json is included
-          retention-days: 7
-      - name: Download documentation artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: docs
-
-      - name: Unzip documentation artifact
-        run: unzip -O UTF-8 -qq 'artifacts/${{ env.ARTIFACT }}' -d dir
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v4
-
-      - name: Package and upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: dir
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+          package: ./frontend/build/standalone