Skip to content

Commit 6fa404e

Browse files
committed
full-scale revision to earlier point in history. need to see if this is a systematic breakage, or there's something else going on.
1 parent 04adc96 commit 6fa404e

File tree

1 file changed

+7
-63
lines changed

1 file changed

+7
-63
lines changed

.github/workflows/main-forestgeo-livesite.yml

+7-63
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
3232
echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
3333
echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
34+
echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env
3435
echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
3536
echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env
3637
echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
@@ -42,20 +43,18 @@ jobs:
4243
echo AZURE_SQL_SCHEMA=${{ secrets.AZURE_SQL_SCHEMA }} >> frontend/.env
4344
echo AZURE_SQL_CATALOG_SCHEMA=${{ secrets.AZURE_SQL_CATALOG_SCHEMA }} >> frontend/.env
4445
echo AZURE_STORAGE_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} >> frontend/.env
45-
echo NODE_ENV=production >> frontend/.env
46+
echo NODE_ENV=development >> frontend/.env
4647
echo PORT=3000 >> frontend/.env
47-
echo FG_PAT=${{ secrets.FG_PAT }} >> frontend/.env
48-
echo OWNER=${{ secrets.OWNER }} >> frontend/.env
49-
echo REPO=${{ secrets.REPO }} >> frontend/.env
5048
5149
- name: create env file (in frontend/ directory) -- development
5250
id: create-env-file-dev
5351
if: startsWith(github.ref, 'refs/heads/forestgeo-app-')
5452
run: |
5553
touch frontend/.env
56-
echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
57-
echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
58-
echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
54+
echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_SECRET }} >> frontend/.env
55+
echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_ID }} >> frontend/.env
56+
echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_TENANT_ID }} >> frontend/.env
57+
echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env
5958
echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
6059
echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_DEV_URL }} >> frontend/.env
6160
echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
@@ -151,59 +150,4 @@ jobs:
151150
app-name: 'forestgeo-livesite'
152151
slot-name: 'development'
153152
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DEVELOPMENT }}
154-
package: ./frontend/build/standalone
155-
156-
build-docs-deploy-docs:
157-
permissions:
158-
id-token: write
159-
pages: write
160-
161-
env:
162-
INSTANCE: 'documentation/fad'
163-
ARTIFACT: 'webHelpFAD2-all.zip'
164-
DOCKER_VERSION: '241.18775'
165-
runs-on: ubuntu-latest
166-
needs: deploy-app
167-
environment:
168-
name: github-pages
169-
url: ${{ steps.deployment.outputs.page_url }}
170-
steps:
171-
- name: Checkout repository
172-
uses: actions/checkout@v4
173-
with:
174-
fetch-depth: 0
175-
176-
- name: Build docs using Writerside Docker builder
177-
uses: JetBrains/writerside-github-action@v4
178-
with:
179-
instance: ${{ env.INSTANCE }}
180-
artifact: ${{ env.ARTIFACT }}
181-
docker-version: ${{ env.DOCKER_VERSION }}
182-
183-
- name: Upload documentation artifact
184-
uses: actions/upload-artifact@v4
185-
with:
186-
name: docs
187-
path: |
188-
artifacts/${{ env.ARTIFACT }}
189-
artifacts/report.json # Ensure report.json is included
190-
retention-days: 7
191-
- name: Download documentation artifact
192-
uses: actions/download-artifact@v4
193-
with:
194-
name: docs
195-
196-
- name: Unzip documentation artifact
197-
run: unzip -O UTF-8 -qq 'artifacts/${{ env.ARTIFACT }}' -d dir
198-
199-
- name: Setup Pages
200-
uses: actions/configure-pages@v4
201-
202-
- name: Package and upload Pages artifact
203-
uses: actions/upload-pages-artifact@v3
204-
with:
205-
path: dir
206-
207-
- name: Deploy to GitHub Pages
208-
id: deployment
209-
uses: actions/deploy-pages@v4
153+
package: ./frontend/build/standalone

0 commit comments

Comments
 (0)