Merge branch 'master' into XBAP-17277

Author: Ripal-Parikh

.commitlintrc.json

@@ -0,0 +1,7 @@
+{
+  "extends": ["@commitlint/config-conventional"],
+  "rules": {
+    "subject-case": [0],
+    "body-max-line-length": [0]
+  }
+}

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

@@ -31,6 +31,6 @@ jobs:
           node-version: 20
 
       - name: Perform release
-        run: npx --package @semantic-release/exec semantic-release
+        run: npx --package @semantic-release/exec --package conventional-changelog-conventionalcommits semantic-release
         env:
           GH_TOKEN: ${{ steps.get_access_token.outputs.token }}

.github/workflows/pr-linting.yml

@@ -1,5 +1,8 @@
 name: PR Linting
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     types: [opened, reopened, synchronize]
@@ -13,4 +16,23 @@ jobs:
         uses: actions/checkout@v4
 
       - name: MegaLinter
-        uses: oxsecurity/megalinter/flavors/documentation@v9
+        uses: oxsecurity/megalinter/flavors/documentation@v9
+
+  commitlint:
+    runs-on: ubuntu-latest
+    name: Conventional Commit Validation
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Validate PR commits with commitlint
+        run: |
+          npm install --no-save @commitlint/cli @commitlint/config-conventional
+          npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose

.github/workflows/pr-validation.yml

@@ -41,7 +41,7 @@ jobs:
           gh workflow run pr.yml \
             --repo xero-internal/xeroapi-sdk-codegen \
             --ref master \
-            --field branch_name="$BRANCH_NAME" \
+            --field oas_branch="$BRANCH_NAME" \
             --field oas_repo="$OAS_REPO"
 
           # Wait a moment for the run to be created

.releaserc

@@ -21,6 +21,11 @@
       }
     ],
     "@semantic-release/github",
-    "@semantic-release/commit-analyzer"
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "preset": "conventionalcommits"
+      }
+    ]
   ]
 }

manifest.json

@@ -27,6 +27,10 @@
       "path": "/xero-payroll-au.yaml",
       "canPreview": true
     },
+    "payrollAuV2": {
+      "path": "/xero-payroll-au-v2.yaml",
+      "canPreview": true
+    },
     "payrollNz": {
       "path": "/xero-payroll-nz.yaml",
       "canPreview": true

scripts/api-diff/api-diff.sh

@@ -12,7 +12,15 @@ cd "$(dirname "$0")/../.."
 
 # Configuration
 DOCKER_IMAGE="${OASDIFF_DOCKER_IMAGE:-tufin/oasdiff:latest}"
-BASE_BRANCH="${BASE_BRANCH:-origin/master}"
+
+# Detect base branch from GitHub Actions environment or fallback to local defaults
+if [ -n "$GITHUB_BASE_REF" ]; then
+    # In GitHub Actions PR, use the base ref (e.g., "master")
+    BASE_BRANCH="${BASE_BRANCH:-origin/$GITHUB_BASE_REF}"
+else
+    # Local development: default to origin/master
+    BASE_BRANCH="${BASE_BRANCH:-origin/master}"
+fi
 
 FAIL_ON_BREAKING=false
 TARGET_FILE=""
@@ -29,9 +37,21 @@ for arg in "$@"; do
     fi
 done
 
+# Detect current branch: GitHub Actions PR branch, or local git branch
+# Allow CURRENT_BRANCH env var to override for testing
+if [ -n "$CURRENT_BRANCH" ]; then
+    # Use explicitly set CURRENT_BRANCH (for testing)
+    :
+elif [ -n "$GITHUB_HEAD_REF" ]; then
+    # Use GitHub Actions PR branch
+    CURRENT_BRANCH="$GITHUB_HEAD_REF"
+else
+    # Use local git branch
+    CURRENT_BRANCH=$(git branch --show-current 2>/dev/null || echo "")
+fi
+
 # If --fail-on-breaking not explicitly set, determine based on branch name
 if [ "$FAIL_ON_BREAKING" = false ]; then
-    CURRENT_BRANCH=${CURRENT_BRANCH:-$(git branch --show-current 2>/dev/null || echo "")}
     if [[ "$CURRENT_BRANCH" == *breaking* ]]; then
         echo "Branch '$CURRENT_BRANCH' contains 'breaking', allowing breaking changes"
         FAIL_ON_BREAKING=false
@@ -135,7 +155,7 @@ for file in $files; do
     echo ""
     echo "--- Breaking changes check ---"
     set +e
-    BREAKING_OUTPUT=$(docker run --rm -v "$(pwd)":/current -v "$TEMP_DIR":/base "$DOCKER_IMAGE" breaking --fail-on ERR --include-path-params /base/"$file" /current/"$file" 2>&1)
+    BREAKING_OUTPUT=$(docker run --rm -v "$(pwd)":/current -v "$TEMP_DIR":/base "$DOCKER_IMAGE" breaking --fail-on WARN --include-path-params /base/"$file" /current/"$file" 2>&1)
     BREAKING_EXIT=$?
     set -e
 

xero-app-store.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.0
 info:
-  version: 10.1.0
+  version: 12.0.1
   title: Xero AppStore API
   description: These endpoints are for Xero Partners to interact with the App Store Billing platform
   termsOfService: https://developer.xero.com/xero-developer-platform-terms-conditions/