Merge pull request #424 from dequelabs/not-release

Release v4.8.1

.circleci/config.yml

@@ -74,7 +74,9 @@ workflows:
             - dependencies_npm
           filters:
             branches:
-              only: develop
+              only:
+                - develop
+                - release
       - release:
           context: html-tools
           requires:

.github/dependabot.yml

@@ -0,0 +1,51 @@
+version: 2
+
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+    commit-message:
+      prefix: "chore"
+    groups:
+      # Any updates not caught by the group config will get individual PRs
+      gha-low-risk:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+    commit-message:
+      prefix: "chore"
+    ignore:
+      # Handled separately by its own workflow
+      - dependency-name: "axe-core"
+    groups:
+      # Any updates not caught by the group config will get individual PRs
+      npm-low-risk:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+    commit-message:
+      prefix: "chore"
+    ignore:
+      # TODO: https://github.com/dequelabs/axe-core-maven-html/issues/378
+      - dependency-name: "org.seleniumhq.selenium:selenium-java"
+        versions: [">=4.14.0"]
+    groups:
+      # Any updates not caught by the group config will get individual PRs
+      maven-low-risk:
+        update-types:
+          - "minor"
+          - "patch"

.github/scripts/prepare_release.sh

@@ -6,11 +6,16 @@ set -e
 releaseLevel="$1"
 
 oldVersion="$(node -pe 'require("./package.json").version')"
-npx standard-version --release-as "$releaseLevel" --skip.commit=true --skip.changelog=true --skip.tag=true
 
-cd selenium
-npx standard-version --release-as "$releaseLevel" --skip.commit=true --skip.changelog=true --skip.tag=true
-cd ..
+# TODO: standard-version is now deprecated: https://github.com/dequelabs/axe-core-maven-html/issues/366
+# If no release level is specified, let standard-version handle versioning
+if [ -z "$releaseLevel" ] 
+then
+  npx standard-version --skip.commit=true --skip.changelog=true --skip.tag=true
+else
+  npx standard-version --release-as "$releaseLevel" --skip.commit=true --skip.changelog=true --skip.tag=true
+fi
+
 newVersion="$(node -pe 'require("./package.json").version')"
 
 

.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

@@ -1,12 +1,15 @@
 name: Sync master/develop branches
+
 on:
   pull_request:
-    types: [closed]
     branches: master
+    types: closed
+
 jobs:
   create_sync_pull_request:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == 'true'
+    timeout-minutes: 1
     steps:
       - uses: dequelabs/action-sync-branches@v1
         with:

.github/workflows/tests.yml

@@ -1,17 +1,23 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - "**" # all branches
-      - "!master" # except master
-      - "!develop" # except develop
+on: push
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+
       - name: Cache npm dependencies
         uses: actions/cache@v3
         id: npm-cache
@@ -25,14 +31,10 @@ jobs:
         id: maven-cache
         with:
           path: ~/.m2/repository
-          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}-${{ matrix.java }}
           restore-keys: |
-            maven-cache-v1-${{ runner.os }}-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          java-version: "8"
-          distribution: "temurin"
+            maven-cache-v1-${{ runner.os }}-${{ matrix.java }}
+
       - name: Install Maven dependencies
         # https://github.com/actions/cache#skipping-steps-based-on-cache-hit
         if: steps.maven-cache.outputs.cache-hit != 'true'
@@ -41,15 +43,16 @@ jobs:
         # https://github.com/actions/cache#skipping-steps-based-on-cache-hit
         if: steps.npm-cache.outputs.cache-hit != 'true'
         run: |
-          npm install &&
-          npm --prefix=selenium install &&
-          npm --prefix=playwright install
+          npm ci &&
+          npm --prefix=selenium ci &&
+          npm --prefix=playwright ci
 
   license-check:
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: 2
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Maven compile licenses
         run: mvn compile license:add-third-party
       - name: Check Selenium licenses
@@ -60,8 +63,12 @@ jobs:
   playwright-tests:
     needs: [license-check, build]
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        java: [8, 11, 17]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         name: Restore npm cache
         id: npm-cache
@@ -75,9 +82,9 @@ jobs:
         id: maven-cache
         with:
           path: ~/.m2/repository
-          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}-${{ matrix.java }}
           restore-keys: |
-            maven-cache-v1-${{ runner.os }}-
+            maven-cache-v1-${{ runner.os }}-${{ matrix.java }}
       - name: Start fixture server
         run: npm --prefix=playwright start &
       - name: Run Playwright tests
@@ -86,9 +93,13 @@ jobs:
   selenium-tests:
     needs: [license-check, build]
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        java: [8, 11, 17]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
       - uses: actions/cache@v3
         name: Restore npm cache
         id: npm-cache
@@ -102,9 +113,9 @@ jobs:
         id: maven-cache
         with:
           path: ~/.m2/repository
-          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: maven-cache-v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}-${{ matrix.java }}
           restore-keys: |
-            maven-cache-v1-${{ runner.os }}-
+            maven-cache-v1-${{ runner.os }}-${{ matrix.java }}
       - name: Start fixture server
         run: python -m http.server 8001 &
         working-directory: selenium/node_modules/axe-test-fixtures/fixtures

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

@@ -1,37 +1,20 @@
 name: Update axe-core
 
-on: [workflow_dispatch]
+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
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         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 }}