fix conflicts

maradeeym · Jun 28, 2022 · fff9811 · fff9811
2 parents a50a7e2 + b6b0952
commit fff9811
Show file tree

Hide file tree

Showing 19 changed files with 1,325 additions and 71 deletions.
diff --git a/.github/workflows/chain-docs.yml b/.github/workflows/chain-docs.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   scan:
     name: Scan
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     if: >-
       github.event_name == 'push' || github.event_name == 'pull_request' || (github.event.comment.body == '/staging' && 
       (github.actor == 'allthatjazzleo' || github.actor == 'tomtau' || github.actor == 'lezzokafka' || github.actor == 'yihuang' || 
@@ -35,9 +35,9 @@ jobs:
     #     sarif_file: reports
   build:
     name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: scan
-    if: >- 
+    if: >-
       github.event_name == 'push' || (github.event.comment.body == '/staging' && (github.actor == 'allthatjazzleo' || github.actor == 'tomtau' || 
       github.actor == 'lezzokafka' || github.actor == 'yihuang' || github.actor == 'calvinaco' || 
       github.actor == 'CeruleanAtMonaco' || github.actor == 'devashishdxt' || github.actor == 'leejw51crypto' || 

diff --git a/ci/scripts/prepare b/ci/scripts/prepare
@@ -16,6 +16,7 @@ BRANCH_CLOUDFRONT_DISTRIBUTION_ID=${BRANCH}_CLOUDFRONT_DISTRIBUTION_ID
 BRANCH_REGION=${BRANCH}_REGION
 aws configure set aws_access_key_id ${!BRANCH_AWS_ACCESS_KEY_ID}
 aws configure set aws_secret_access_key ${!BRANCH_AWS_SECRET_ACCESS_KEY}
+aws configure set region us-east-1
 
 export S3_BUCKET=${!BRANCH_BUCKET_NAME}
 export CLOUDFRONT_DISTRIBUTION_ID=${!BRANCH_CLOUDFRONT_DISTRIBUTION_ID}