Skip to content

Commit 0d0e351

Browse files
authored
Merge pull request #774 from github/repo-sync
Manual repo sync to fix the Actions error
2 parents 269114b + ff4aeab commit 0d0e351

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = [
3131
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
3232
'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',
3333
'repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88',
34-
'repo-sync/pull-request@58af525d19d3c2b4f744d3348c6823b6340a4921',
34+
'repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d',
3535
'rtCamp/action-slack-notify@e17352feaf9aee300bf0ebc1dfbf467d80438815',
3636
'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0'
3737
]

.github/workflows/repo-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
4646

4747
- name: Create pull request
48-
uses: repo-sync/pull-request@58af525d19d3c2b4f744d3348c6823b6340a4921
48+
uses: repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
5151
with:

tests/links-and-images/developer-links-and-images.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ const { getVersionedPathWithLanguage } = require('../../lib/path-utils')
99
const renderContent = require('../../lib/render-content')
1010
const checkImages = require('../../lib/check-images')
1111
const checkLinks = require('../../lib/check-developer-links')
12+
const enterpriseServerVersions = Object.keys(require('../../lib/all-versions'))
13+
.filter(version => version.startsWith('enterprise-server@'))
1214
const { getOldVersionFromNewVersion } = require('../../lib/old-versions-utils')
1315

1416
// schema-derived data to add to context object
@@ -64,6 +66,7 @@ describe('page rendering', () => {
6466
page.version = pageVersion
6567
context.page = page
6668
context.currentVersion = pageVersion
69+
context.enterpriseServerVersions = enterpriseServerVersions
6770

6871
const relevantPermalink = page.permalinks.find(permalink => permalink.pageVersion === pageVersion)
6972

tests/links-and-images/links-and-images.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const getApplicableVersions = require('../../lib/get-applicable-versions')
55
const renderContent = require('../../lib/render-content')
66
const checkImages = require('../../lib/check-images')
77
const checkLinks = require('../../lib/check-links')
8+
const enterpriseServerVersions = Object.keys(require('../../lib/all-versions'))
9+
.filter(version => version.startsWith('enterprise-server@'))
810
const flat = require('flat')
911
const { last } = require('lodash')
1012

@@ -56,6 +58,7 @@ describe('page rendering', () => {
5658
page.version = pageVersion
5759
context.page = page
5860
context.currentVersion = pageVersion
61+
context.enterpriseServerVersions = enterpriseServerVersions
5962

6063
// collect elements of the page that may contain links
6164
const pageContent = page.intro + page.permissions + page.markdown

0 commit comments

Comments
 (0)