Security-best-practices/Journaling: Resolve merge conflict

.github/workflows/cd.yml

@@ -29,16 +29,14 @@ jobs:
       - run: git submodule update --init
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install DFX
         uses: dfinity/setup-dfx@main
 
       - name: Dump Identity
         run: |
-          mkdir ~/.config/dfx
-          mkdir ~/.config/dfx/identity
-          mkdir ~/.config/dfx/identity/default
+          mkdir -p ~/.config/dfx/identity/default
           echo $DFX_IDENTITY_DESIGN_TEAM | base64 -d > ~/.config/dfx/identity/default/identity.pem
           sed -i 's/\\r\\n/\r\n/g' ~/.config/dfx/identity/default/identity.pem
         env:
@@ -67,6 +65,8 @@ jobs:
           CONTENTFUL_ACCESS_TOKEN: ${{ secrets.CONTENTFUL_ACCESS_TOKEN }}
           CONTENTFUL_HOST: ${{ secrets.CONTENTFUL_HOST }}
           CONTENTFUL_SPACE_ID: ${{ secrets.CONTENTFUL_SPACE_ID }}
+          AIRTABLE_KEY: ${{ secrets.AIRTABLE_SA_PORTAL_SERVICE_ACCOUNT }}
+          YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }}
 
       - name: Get URL
         id: get-url

.github/workflows/fork-build.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: "Build website"
         run: |
           git submodule update --init

.github/workflows/preview-deployment.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: actions/github-script@v6
         with:
           script: |
@@ -77,6 +77,8 @@ jobs:
           CONTENTFUL_ACCESS_TOKEN: ${{ secrets.CONTENTFUL_ACCESS_TOKEN }}
           CONTENTFUL_HOST: ${{ secrets.CONTENTFUL_HOST }}
           CONTENTFUL_SPACE_ID: ${{ secrets.CONTENTFUL_SPACE_ID }}
+          AIRTABLE_KEY: ${{ secrets.AIRTABLE_SA_PORTAL_SERVICE_ACCOUNT }}
+          YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }}
           SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
 
       - name: Report build error

.github/workflows/update-search.yml

@@ -12,7 +12,7 @@ jobs:
       - run: git submodule update --init
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - name: Dump Identity
         run: |
           mkdir -p ~/.config/dfx/identity/default
@@ -28,6 +28,8 @@ jobs:
           CONTENTFUL_ACCESS_TOKEN: ${{ secrets.CONTENTFUL_ACCESS_TOKEN }}
           CONTENTFUL_HOST: ${{ secrets.CONTENTFUL_HOST }}
           CONTENTFUL_SPACE_ID: ${{ secrets.CONTENTFUL_SPACE_ID }}
+          AIRTABLE_KEY: ${{ secrets.AIRTABLE_SA_PORTAL_SERVICE_ACCOUNT }}
+          YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }}
 
       - name: Update search index
         run: |

.gitmodules

@@ -15,3 +15,12 @@
 	path = submodules/interface-spec
 	url = https://github.com/dfinity/interface-spec.git
 	branch = public
+[submodule "submodules/samples"]
+	path = submodules/samples
+	url = https://github.com/dfinity/examples.git
+[submodule "submodules/dfxvm"]
+	path = submodules/dfxvm
+	url = https://github.com/dfinity/dfxvm.git
+[submodule "submodules/response-verfication"]
+	path = submodules/response-verfication
+	url = https://github.com/dfinity/response-verification

.prettierrc

@@ -1,3 +1,5 @@
 {
-  "singleQuote": false
+  "singleQuote": false,
+  "proseWrap": "always",
+  "printWidth": 80
 }