Skip to content

Bulk Windows fixes #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 9, 2020
Merged

Bulk Windows fixes #369

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b1f1e1c
correct for windows slashes in redirect `precompile`
jeffmcaffer Oct 9, 2020
0c7b877
add slash() calls to fix windows paths
jeffmcaffer Oct 9, 2020
d16c1f2
add missing slash require
jeffmcaffer Oct 9, 2020
a9112d8
fix up redirect paths for Windows
jeffmcaffer Oct 9, 2020
c906187
handle windows paths in product definitions
jeffmcaffer Oct 9, 2020
f45e503
Merge branch 'main' into jeffmcaffer-patch-2
zeke Oct 9, 2020
2c60222
Merge branch 'main' into jeffmcaffer-patch-5
chiedo Oct 9, 2020
6e2fa20
Merge remote-tracking branch 'origin/jeffmcaffer-patch-4' into bulk-w…
chiedo Oct 9, 2020
7e22af7
Merge remote-tracking branch 'origin/jeffmcaffer-patch-3' into bulk-w…
chiedo Oct 9, 2020
8872f63
Merge remote-tracking branch 'origin/jeffmcaffer-patch-2' into bulk-w…
chiedo Oct 9, 2020
560ccf1
Merge branch 'main' into bulk-windows-fixes-1602277955
chiedo Oct 9, 2020
5242ac5
Make windows tests manually triggerable
chiedo Oct 9, 2020
4fda0ab
Merge branch 'bulk-windows-fixes-1602277955' of https://github.com/gi…
chiedo Oct 9, 2020
3909dbf
Merge branch 'main' into bulk-windows-fixes-1602277955
chiedo Oct 9, 2020
d671034
Enable windows testing on github/docs
chiedo Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions middleware/archived-enterprise-versions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const path = require('path')
const slash = require('slash')
const { latest, deprecated, firstVersionDeprecatedOnNewSite, lastVersionWithoutStubbedRedirectFiles } = require('../lib/enterprise-server-releases')
const patterns = require('../lib/patterns')
const versionSatisfiesRange = require('../lib/version-satisfies-range')
Expand Down Expand Up @@ -69,7 +70,7 @@ module.exports = async (req, res, next) => {
// for <2.13: /2.12/user/articles/viewing-contributions-on-your-profile
function getProxyPath (reqPath, requestedVersion) {
const proxyPath = versionSatisfiesRange(requestedVersion, `>=${firstVersionDeprecatedOnNewSite}`)
? path.join('/', requestedVersion, reqPath)
? slash(path.join('/', requestedVersion, reqPath))
: reqPath.replace(/^\/enterprise/, '')

return `https://github.github.com/help-docs-archived-enterprise-versions${proxyPath}`
Expand Down Expand Up @@ -97,7 +98,7 @@ function getFallbackRedirects (req, requestedVersion) {
// ]
.filter(oldPath => oldPath.startsWith('/enterprise') && patterns.enterpriseNoVersion.test(oldPath))
// add in the current language and version
.map(oldPath => path.join('/', req.context.currentLanguage, oldPath.replace('/enterprise/', `/enterprise/${requestedVersion}/`)))
.map(oldPath => slash(path.join('/', req.context.currentLanguage, oldPath.replace('/enterprise/', `/enterprise/${requestedVersion}/`))))
// ignore paths that match the requested path
.filter(oldPath => oldPath !== req.path)
}