Deployment target issues

[howard-e]

Lately, we have been coming up on various deployment issues ranging from Netlify cache concerns to potentially dereferenced commits.

• Investigate mitigation strategies for Netlify cache issues
• Automated handling of upload-pack: not our ref error
• "Dirty rebase"

[howard-e]

upload-pack: not our ref error example

9:26:18 AM: build-image version: 69179d37c92919bcf501ca9a8de95762ede3ffc5 (focal)
9:26:18 AM: buildbot version: f0767d95f239f529580f009938af6c81a43d4281
9:26:18 AM: Fetching cached dependencies
9:26:19 AM: Starting to download cache of 288.9MB
9:26:20 AM: Finished downloading cache in 1.942s
9:26:20 AM: Starting to extract cache
9:26:23 AM: Finished extracting cache in 2.64s
9:26:23 AM: Finished fetching cache in 4.646s
9:26:23 AM: Starting to prepare the repo for build
9:26:24 AM: Preparing Git Reference pull/392/head
9:26:25 AM: Failed during stage 'preparing repo': From https://github.com/w3c/wai-aria-practices
 * branch            refs/pull/392/head -> FETCH_HEAD
Fetching submodule _external/aria-practices
From https://github.com/w3c/aria-practices
 * [new branch]        dependabot/npm_and_yarn/dependencies-854f459418 -> origin/dependabot/npm_and_yarn/dependencies-854f459418
 * [new branch]        dependabot/npm_and_yarn/eslint-config-prettier-10.1.1 -> origin/dependabot/npm_and_yarn/eslint-config-prettier-10.1.1
 * [new branch]        dependabot/npm_and_yarn/globals-16.0.0 -> origin/dependabot/npm_and_yarn/globals-16.0.0
 * [new branch]        dependabot/npm_and_yarn/tar-fs-3.0.8 -> origin/dependabot/npm_and_yarn/tar-fs-3.0.8
 + e10114c0...4968035e dependabot/npm_and_yarn/vnu-jar-24.10.17 -> origin/dependabot/npm_and_yarn/vnu-jar-24.10.17  (forced update)
   0e0dabfb..a789325d  high-contrast-practice -> origin/high-contrast-practice
   9e4946d7..9ce64366  main                   -> origin/main
   30205444..c0beafe5  search-landmark        -> origin/search-landmark
Fetching submodule _external/data
From https://github.com/w3c/wai-website-data
   cfd1baa..f9f6840  master     -> origin/master
fatal: remote error: upload-pack: not our ref de588b48946cb4c8a30bb9e8925ecb62e689211d
Errors during submodule fetch:
	_external/aria-practices
: exit status 1
9:26:25 AM: Error pulling repository: From https://github.com/w3c/wai-aria-practices
 * branch            refs/pull/392/head -> FETCH_HEAD
Fetching submodule _external/aria-practices
From https://github.com/w3c/aria-practices
 * [new branch]        dependabot/npm_and_yarn/dependencies-854f459418 -> origin/dependabot/npm_and_yarn/dependencies-854f459418
 * [new branch]        dependabot/npm_and_yarn/eslint-config-prettier-10.1.1 -> origin/dependabot/npm_and_yarn/eslint-config-prettier-10.1.1
 * [new branch]        dependabot/npm_and_yarn/globals-16.0.0 -> origin/dependabot/npm_and_yarn/globals-16.0.0
 * [new branch]        dependabot/npm_and_yarn/tar-fs-3.0.8 -> origin/dependabot/npm_and_yarn/tar-fs-3.0.8
 + e10114c0...4968035e dependabot/npm_and_yarn/vnu-jar-24.10.17 -> origin/dependabot/npm_and_yarn/vnu-jar-24.10.17  (forced update)
   0e0dabfb..a789325d  high-contrast-practice -> origin/high-contrast-practice
   9e4946d7..9ce64366  main                   -> origin/main
   30205444..c0beafe5  search-landmark        -> origin/search-landmark
Fetching submodule _external/data
From https://github.com/w3c/wai-website-data
   cfd1baa..f9f6840  master     -> origin/master
fatal: remote error: upload-pack: not our ref de588b48946cb4c8a30bb9e8925ecb62e689211d
Errors during submodule fetch:
	_external/aria-practices
: exit status 1
9:26:25 AM: Failing build: Failed to prepare repo

[howard-e]

#426 should address "Investigate mitigation strategies for Netlify cache issues" and "Automated handling of upload-pack: not our ref error". Leaving these open until enough PRs have been submitted to fully confirm.

The issue came from generated branches not properly purging the APG commits that are removed when a PR is merged and its branch deleted. That PR should deinit and reinit the submodules to avoid that problem, in pr-create

---

#427 should address the "Dirty rebase" by iteratively handling merge and rebase conflicts in pr-create. This has only been tested with #379 so far:

error in 'Force rebase the switched branch onto main' step before merging #427

From https://github.com/w3c/wai-aria-practices
 * branch              main       -> FETCH_HEAD
Rebasing (1/10)
Failed to merge submodule _external/aria-practices (commits not present)
hint: Recursive merging with submodules currently only supports trivial cases.
CONFLICT (submodule): Merge conflict in _external/aria-practices
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint:  - come back to superproject and run:
hint:
hint:       git add _external/aria-practices
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
error: could not apply 180b1770... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 180b1770... # chore: Update branch with latest `update/skipto` changes and submodule updates
Handling submodule conflicts...
Merge made by the 'ort' strategy.
 content/patterns/landmarks/examples/search.html |    1 -
 package-lock.json                               | 1502 ++++++++++-------------
 package.json                                    |   24 +-
 scripts/coverage-report.js                      |   21 +-
 4 files changed, 688 insertions(+), 860 deletions(-)
/home/runner/work/wai-aria-practices/wai-aria-practices
[detached HEAD af8e8f0d] chore: Update branch with latest `update/skipto` changes and submodule updates
 2 files changed, 3409 insertions(+), 748 deletions(-)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Auto-merging ARIA/apg/patterns/landmarks/examples/search.html
CONFLICT (content): Merge conflict in ARIA/apg/patterns/landmarks/examples/search.html
Rebasing (5/10)
error: could not apply ead002b4... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply ead002b4... # chore: Update branch with latest `update/skipto` changes and submodule updates
Updated 1 path from the index
[detached HEAD 954968c5] chore: Update branch with latest `update/skipto` changes and submodule updates
 14 files changed, 2117 insertions(+), 2117 deletions(-)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
Failed to merge submodule _external/aria-practices (commits not present)
hint: This can be accomplished with the following steps:
hint:  - come back to superproject and run:
hint:
hint:       git add _external/aria-practices
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
CONFLICT (submodule): Merge conflict in _external/aria-practices
error: could not apply bd340a23... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bd340a23... # chore: Update branch with latest `update/skipto` changes and submodule updates

The above would prevent the commit happening in the 'Commit changed files and submodule updates' step with the error:

you need to resolve your current index first

Started: bash /home/runner/work/_actions/stefanzweifel/git-auto-commit-action/v5/entrypoint.sh
INPUT_REPOSITORY value: .
INPUT_STATUS_OPTIONS: 
INPUT_FILE_PATTERN: .
INPUT_BRANCH value: apg/update/skipto
error: you need to resolve your current index first
_external/aria-practices: needs merge
Error: Invalid status code: 1
    at ChildProcess.<anonymous> (/home/runner/work/_actions/stefanzweifel/git-auto-commit-action/v5/index.js:17:19)
    at ChildProcess.emit (node:events:524:28)
    at maybeClose (node:internal/child_process:1104:16)
    at ChildProcess._handle.onexit (node:internal/child_process:304:5) {
  code: 1
}
Error: Invalid status code: 1
    at ChildProcess.<anonymous> (/home/runner/work/_actions/stefanzweifel/git-auto-commit-action/v5/index.js:17:19)
    at ChildProcess.emit (node:events:524:28)
    at maybeClose (node:internal/child_process:1104:16)
    at ChildProcess._handle.onexit (node:internal/child_process:304:5)

The above build logs available here.

After merging #427:

the 'Force rebase the switched branch onto main' step now shows that 10 merges + rebases were successfully done

From https://github.com/w3c/wai-aria-practices
 * branch              main       -> FETCH_HEAD
Rebasing (1/10)
Failed to merge submodule _external/aria-practices (commits not present)
CONFLICT (submodule): Merge conflict in _external/aria-practices
hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint:  - come back to superproject and run:
hint:
hint:       git add _external/aria-practices
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
error: could not apply 180b1770... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 180b1770... # chore: Update branch with latest `update/skipto` changes and submodule updates
Handling submodule conflicts...
Checking for submodule conflicts...
/home/runner/work/wai-aria-practices/wai-aria-practices
Resolving file conflicts...
Continuing rebase...
[detached HEAD f6e61be2] chore: Update branch with latest `update/skipto` changes and submodule updates
 2 files changed, 3409 insertions(+), 748 deletions(-)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Auto-merging ARIA/apg/patterns/landmarks/examples/search.html
CONFLICT (content): Merge conflict in ARIA/apg/patterns/landmarks/examples/search.html
Rebasing (5/10)
error: could not apply ead002b4... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply ead002b4... # chore: Update branch with latest `update/skipto` changes and submodule updates
Rebase continue failed, checking if more conflicts exist...
More conflicts detected, continuing to resolve...
Handling submodule conflicts...
Checking for submodule conflicts...
/home/runner/work/wai-aria-practices/wai-aria-practices
Resolving file conflicts...
Resolving conflict in: ARIA/apg/patterns/landmarks/examples/search.html
Updated 1 path from the index
Continuing rebase...
[detached HEAD 589f87e5] chore: Update branch with latest `update/skipto` changes and submodule updates
 14 files changed, 2117 insertions(+), 2117 deletions(-)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
Failed to merge submodule _external/aria-practices (commits not present)
CONFLICT (submodule): Merge conflict in _external/aria-practices
hint: This can be accomplished with the following steps:
hint:  - come back to superproject and run:
hint:
hint:       git add _external/aria-practices
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
error: could not apply bd340a23... chore: Update branch with latest `update/skipto` changes and submodule updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bd340a23... # chore: Update branch with latest `update/skipto` changes and submodule updates
Rebase continue failed, checking if more conflicts exist...
More conflicts detected, continuing to resolve...
Handling submodule conflicts...
Checking for submodule conflicts...
/home/runner/work/wai-aria-practices/wai-aria-practices
Resolving file conflicts...
Continuing rebase...
Rebasing (10/10)
Successfully rebased and updated refs/heads/apg/update/skipto.
Submodule conflicts fix step completed successfully
No submodule conflicts detected or no rebase in progress

The build log for the above is available here.