Merge remote-tracking branch 'origin/main'

Author: James Martin

.github/workflows/integration_test.yml

@@ -4,11 +4,11 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         test-branch: [rails5, rails6, rails7]
+    timeout-minutes: 20
     steps:
     - name: Checkout
       uses: actions/checkout@v2

.github/workflows/rails_6_webpacker_integration_tests.yaml

@@ -46,10 +46,14 @@ jobs:
       with:
         node-version: 16
       if: matrix.test-branch == 'rails6-webpacker'
+    - name: Set up Python 2.7
+      uses: actions/setup-python@v4
+      with:
+        python-version: '2.7'
     - name: Generate Webpacker config
       run: |
         cd $GITHUB_WORKSPACE/test_app
-        yarn install --check-files
+        CXXFLAGS="--std=c++17" yarn install --check-files
         bundle exec rake webpacker:compile
       if: matrix.test-branch == 'rails6-webpacker'
     - name: Test