Merge pull request #364 from dequelabs/release-2024-01-15

chore: RC v4.8.1

.circleci/config.yml

@@ -18,7 +18,7 @@ commands:
           # TODO: remove when chromedriver downloads are fixed
           chrome-version: 116.0.5845.96
       - node/install:
-          node-version: '16.13'
+          node-version: "16.13"
       - run: gem install bundler # setup bundler
       - run: rake bootstrap # bootstrap packages
 
@@ -86,7 +86,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '16.13'
+          node-version: "16.13"
       - bootstrap
       - run: bash .circleci/print_license.sh
 
@@ -104,6 +104,7 @@ workflows:
             branches:
               only:
                 - develop
+                - release
       - production_release:
           requires:
             - test

.github/scripts/prepare_release.sh

@@ -6,7 +6,15 @@ set -e
 releaseLevel="$1"
 
 oldVersion="$(node -pe 'require("./package.json").version')"
-npx standard-version --release-as "$releaseLevel" --skip.commit=true --skip.tag=true
+
+# If no release level is specified, let commit-and-tag-version handle versioning
+if [ -z "$releaseLevel" ] 
+then
+  npx commit-and-tag-version --skip.commit=true --skip.tag=true
+else
+  npx commit-and-tag-version --release-as "$releaseLevel" --skip.commit=true --skip.tag=true
+fi
+
 newVersion="$(node -pe 'require("./package.json").version')"
 
 sed -i -e "s/  VERSION\\s*=\\s*\"$oldVersion\"/  VERSION = \"$newVersion\"/" version.rb

.github/workflows/create-release-candidate.yml

@@ -0,0 +1,24 @@
+name: Create release candidate
+
+on:
+  workflow_dispatch:
+    inputs:
+      version-locked:
+        type: boolean
+        description: Prevent this action from creating a minor or major release
+        default: true
+
+jobs:
+  create-release-candidate:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: dequelabs/axe-api-team-public/.github/actions/create-release-candidate-v1@main
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          base: "master"
+          head: "develop"
+          release-script-path: "./.github/scripts/prepare_release.sh"
+          version-locked: ${{ inputs.version-locked }}
+        env:
+          GH_TOKEN: ${{ secrets.GH_PROJECT_TOKEN }}

.github/workflows/semantic-pr-footer.yml

@@ -0,0 +1,16 @@
+name: Semantic PR footer
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+jobs:
+  semantic-pr-footer:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - uses: dequelabs/axe-api-team-public/.github/actions/semantic-pr-footer-v1@main

.github/workflows/semantic-pr-title.yml

@@ -11,5 +11,6 @@ on:
 jobs:
   semantic-pr-title:
     runs-on: ubuntu-latest
+    timeout-minutes: 1
     steps:
       - uses: dequelabs/semantic-pr-title@v1

.github/workflows/sync-master-develop.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   create_sync_pull_request:
     runs-on: ubuntu-latest
+    timeout-minutes: 2
     steps:
       - uses: dequelabs/action-sync-branches@v1
         with:

.github/workflows/update-axe-core.yml

@@ -1,38 +1,20 @@
 name: Update axe-core
 
 on:
+  schedule:
+    # Run every night at midnight
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 1
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-      - id: update
-        uses: dequelabs/update-axe-core@v1
-      - id: type
-        run: |
-          CommitType=""
-          if [ "${{ steps.update.outputs.patch_version_updated }}" == "true" ]; then
-            CommitType="fix"
-          elif [ "${{ steps.update.outputs.minor_version_updated }}" == "true" ]; then
-            CommitType="feat"
-          elif [ "${{ steps.update.outputs.major_version_updated }}" == "true" ]; then
-            CommitType="feat"
-          fi
-          echo "type=$CommitType" >>"$GITHUB_OUTPUT"
-      - name: Open PR
-        uses: peter-evans/create-pull-request@v4
+      - uses: dequelabs/axe-api-team-public/.github/actions/create-update-axe-core-pull-request-v1@main
         with:
-          token: ${{ secrets.PAT }}
-          commit-message: '${{ steps.type.outputs.type }}: Update axe-core to v${{ steps.update.outputs.version }}'
-          branch: auto-update-axe-core
-          base: develop
-          title: '${{ steps.type.outputs.type }}: Update axe-core to v${{ steps.update.outputs.version }}'
-          body: |
-            This patch updates version of [`axe-core`](https://npmjs.org/axe-core) to v${{ steps.update.outputs.version }}.
-
-            This PR was opened by a robot :robot: :tada:.
+          token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
+
+## [4.8.1](https://github.com/dequelabs/axe-core-gems/compare/v4.8.0...v4.8.1) (2024-01-15)
+
+### Bug Fixes
+
+* Update axe-core to v4.8.2 ([#332](https://github.com/dequelabs/axe-core-gems/issues/332)) ([b3789c4](https://github.com/dequelabs/axe-core-gems/commit/b3789c44e433c82743a84029d2bac7c529d32047))
+* Update axe-core to v4.8.3 ([#360](https://github.com/dequelabs/axe-core-gems/issues/360)) ([cb6338c](https://github.com/dequelabs/axe-core-gems/commit/cb6338c222a55825f4ec9f04699c775d76508a26))
+
 
 ## [4.8.0](https://github.com/dequelabs/axe-core-gems/compare/v4.6.1...v4.8.0) (2023-09-27)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-core-gems",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "license": "MPL-2.0",
   "private": true,
   "repository": {
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "axe-test-fixtures": "github:dequelabs/axe-test-fixtures",
-    "conventional-changelog-cli": "^2.2.2",
-    "standard-version": "^9.5.0"
+    "commit-and-tag-version": "^11.2.4",
+    "conventional-changelog-cli": "^2.2.2"
   }
 }

packages/axe-core-api/package.json

@@ -2,6 +2,6 @@
   "name": "axe-core-api",
   "license": "MPL-2.0",
   "dependencies": {
-    "axe-core": "4.8.2"
+    "axe-core": "^4.8.3"
   }
 }

version.rb

@@ -1,5 +1,5 @@
 # this version is used by all the packages
 
 module AxeCoreGems
-  VERSION = "4.8.0"
+  VERSION = "4.8.1"
 end