Merge tag 'v1.5.0' into staging

accessibility-exchange · Nov 11, 2024 · bb13466 · bb13466
2 parents 411bbec + 3793df2
commit bb13466
Show file tree

Hide file tree

Showing 154 changed files with 7,125 additions and 6,434 deletions.
diff --git a/.commitlintrc.json b/.commitlintrc.json
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: technote-space/get-diff-action@v6
+      - uses: greguintow/get-diff-action@v7
         id: git-diff
         with:
           patterns: |
@@ -27,12 +27,15 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-      - name: Cache Composer packages
-        if: steps.git-diff.outputs.diff
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: php-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         if: steps.git-diff.outputs.diff
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/.github/workflows/asset-lint.yml b/.github/workflows/asset-lint.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: technote-space/get-diff-action@v6
+      - uses: greguintow/get-diff-action@v7
         id: git-diff
         with:
           patterns: |
@@ -28,12 +28,15 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-      - name: Cache Composer packages
-        if: steps.git-diff.outputs.diff
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: php-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         if: steps.git-diff.outputs.diff
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: technote-space/get-diff-action@v6
+      - uses: greguintow/get-diff-action@v7
         id: git-diff
         with:
           patterns: |
@@ -31,12 +31,15 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-      - name: Cache Composer packages
-        if: steps.git-diff.outputs.diff
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: php-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: Install Dependencies
         if: steps.git-diff.outputs.diff
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
@@ -73,7 +76,7 @@ jobs:
         run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
       - name: Start Chrome Driver
         if: steps.git-diff.outputs.diff
-        run: ./vendor/laravel/dusk/bin/chromedriver-linux &
+        run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
       - name: Run Laravel Server
         if: steps.git-diff.outputs.diff
         run: |

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: technote-space/get-diff-action@v6
+      - uses: greguintow/get-diff-action@v7
         id: git-diff
         with:
           patterns: |
@@ -33,12 +33,15 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: pcov
-      - name: Cache Composer packages
-        if: steps.git-diff.outputs.diff
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: php-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: Install Dependencies
         if: steps.git-diff.outputs.diff
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }} # https://github.com/GoogleChrome/lighthouse-ci/issues/172
-      - uses: technote-space/get-diff-action@v6
+      - uses: greguintow/get-diff-action@v7
         id: git-diff
         with:
           patterns: |
@@ -34,12 +34,15 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-      - name: Cache Composer packages
-        if: steps.git-diff.outputs.diff
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: php-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: Install Dependencies
         if: steps.git-diff.outputs.diff
         run: composer install -q --no-dev --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/.github/workflows/merge-release.yml b/.github/workflows/merge-release.yml
@@ -0,0 +1,91 @@
+name: Merge Release
+
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to merge into'
+        required: true
+        type: string
+        default: production
+      tag:
+        description: 'Tag to merge'
+        required: true
+        type: string
+
+jobs:
+  merge-release:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: true
+
+    name: Merge tag
+
+    steps:
+    - name: Determine branch
+      run: |
+        echo 'BRANCH='${{ inputs.branch || 'staging' }} >> $GITHUB_ENV
+
+    - name: Checkout "${{ env.BRANCH }}" branch locally
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.BRANCH }}
+        fetch-tags: true
+        fetch-depth: 0
+
+    - uses: actions/create-github-app-token@v1
+      id: app-token
+      with:
+        app-id: ${{ vars.GHA_APP_ID }}
+        private-key: ${{ secrets.GHA_PRIVATE_KEY }}
+
+    - name: Get GitHub App User ID
+      if: ${{ github.event_name == 'release' }}
+      id: get-user-id
+      run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+      env:
+        GH_TOKEN: ${{ steps.app-token.outputs.token }}
+
+    - name: Update values for git user config (release)
+      if: ${{ github.event_name == 'release' }}
+      run: |
+        echo "GIT_USER_NAME=${{ steps.app-token.outputs.app-slug }}[bot]" >> $GITHUB_ENV
+        echo "GIT_USER_EMAIL=${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>" >> $GITHUB_ENV
+
+    - name: Update values for git user config (workflow_dispatch)
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        # fetch user info
+        user=$(gh api \
+          -H "Accept: application/vnd.github+json" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          /user/$ACCOUNT_ID )
+
+        # get user's name and email
+        # email will be set to null if it is private
+        name=$(echo $user | jq '.name')
+        email=$(echo $user | jq '.email')
+
+        # store in environment variables to use for setting up git user
+        echo "GIT_USER_NAME=$name" >> $GITHUB_ENV
+        echo "GIT_USER_EMAIL=$email" >> $GITHUB_ENV
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ACCOUNT_ID: ${{ github.actor_id }}
+
+    - name: Merge tag to local "${{ env.BRANCH }}" branch
+      run: |
+          git config --local user.email "$GIT_USER_EMAIL"
+          git config --local user.name "$GIT_USER_NAME"
+          git merge ${{ inputs.tag || github.event.release.tag_name }}
+
+    - name: Push merge to repository's "${{ env.BRANCH }}" branch
+      uses: ad-m/github-push-action@v0.8.0
+      with:
+        github_token: ${{ steps.app-token.outputs.token }}
+        branch: ${{ env.BRANCH }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -8,10 +8,18 @@ on:
 jobs:
   release-please:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
-      - uses: google-github-actions/release-please-action@v4
-        id: release
+      - uses: actions/create-github-app-token@v1
+        id: app-token
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          app-id: ${{ vars.GHA_APP_ID }}
+          private-key: ${{ secrets.GHA_PRIVATE_KEY }}
+
+      - uses: googleapis/release-please-action@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
           config-file: release-please-config.json
           manifest-file: .release-please-manifest.json
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install lint-staged
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "1.4.1"
+    ".": "1.5.0"
 }