merge: incorporate main branch changes

- Resolve integration.yml merge conflicts (user-agent assertions)
- Fix OctokitOptions import path to @octokit/core/dist-types/types
- Rebuild dist

.github/workflows/integration.yml

@@ -211,7 +211,9 @@ jobs:
     strategy:
       matrix:
         environment: ['', 'debug-integration-test']
-    environment: ${{ matrix.environment }}
+    environment:
+      name: ${{ matrix.environment }}
+      deployment: false
     name: "Integration test: debug option (runner.debug mode ${{ matrix.environment && 'enabled' || 'disabled' }})"
     runs-on: ubuntu-latest
     steps:

src/retry-options.ts

@@ -1,5 +1,5 @@
 import * as core from '@actions/core'
-import {OctokitOptions} from '@octokit/core/types'
+import {OctokitOptions} from '@octokit/core/dist-types/types'
 import {RequestRequestOptions} from '@octokit/types'
 
 export type RetryOptions = {