From 30c56d25e1666da6a68987577cd6c110014737e5 Mon Sep 17 00:00:00 2001
From: Andrew Polk <andrew_polk@sil.org>
Date: Tue, 12 Sep 2023 16:47:18 -0700
Subject: [PATCH] Fix pdf generation workflow

---
 .../workflows/generate-and-upload-pdfs.yml    | 11 +++++++----
 .github/workflows/release.yml                 | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/generate-and-upload-pdfs.yml b/.github/workflows/generate-and-upload-pdfs.yml
index 87cf6fe..a88eaaa 100644
--- a/.github/workflows/generate-and-upload-pdfs.yml
+++ b/.github/workflows/generate-and-upload-pdfs.yml
@@ -1,4 +1,4 @@
-name: Generate PDFs
+name: Generate and Upload PDFs
 on:
   workflow_dispatch:
     inputs:
@@ -9,8 +9,8 @@ on:
         type: string
 jobs:
   release:
-    name: Generate PDFs
-    #name: Generate PDF for ${{ inputs.language }}
+    name: Generate and Upload PDFs
+    #name: Generate and Upload PDF for ${{ inputs.language }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -26,7 +26,10 @@ jobs:
       - name: Generate PDFs
         run: yarn make-pdf
       - name: Upload PDFs to S3
-        run: aws s3 cp ./build/ s3://${{ secrets.AWS_BUCKET }}/ --recursive --exclude "*" --include "*.pdf" --exclude "*/*" --dryrun
+        run: |
+          aws s3 cp ./build/downloads/ s3://${{ secrets.AWS_BUCKET }}/downloads/ --exclude "*" --include "*.pdf"
+          aws s3 cp ./build/fr/downloads/ s3://${{ secrets.AWS_BUCKET }}/fr/downloads/ --exclude "*" --include "*.pdf"
+          aws s3 cp ./build/es/downloads/ s3://${{ secrets.AWS_BUCKET }}/es/downloads/ --exclude "*" --include "*.pdf"
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a324d6..377586b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,11 +56,14 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: "us-east-1"
       # Make and upload the PDF after uploading to S3 since the PDF is created from content on S3.
-      # - name: Prepare PDF Download
-      #   run: yarn make-pdf
-      # - name: Upload PDFs to S3
-      #   run: aws s3 cp ./build/ s3://${{ secrets.AWS_BUCKET }}/ --recursive --exclude "*" --include "*.pdf" --exclude "*/*"
-      #   env:
-      #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-      #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      #     AWS_DEFAULT_REGION: "us-east-1"
+      - name: Generate PDFs
+        run: yarn make-pdf
+      - name: Upload PDFs to S3
+        run: |
+          aws s3 cp ./build/downloads/ s3://${{ secrets.AWS_BUCKET }}/downloads/ --exclude "*" --include "*.pdf"
+          aws s3 cp ./build/fr/downloads/ s3://${{ secrets.AWS_BUCKET }}/fr/downloads/ --exclude "*" --include "*.pdf"
+          aws s3 cp ./build/es/downloads/ s3://${{ secrets.AWS_BUCKET }}/es/downloads/ --exclude "*" --include "*.pdf"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: "us-east-1"