-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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.
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
Custom domains for [JitPack] artifacts #8333
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
54e2393
Custom domains for JitPack artifacts
DadiBit bd1cd30
FIx jitpack-version test
DadiBit f60b145
style: missing comma
DadiBit b65e4cf
fix: name for both jitpack-version redirectors
DadiBit 21f6e68
chore: comment explaining endpoint change
DadiBit a711e8c
use more conventional names for redirectors
chris48s File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,10 @@ export const t = new ServiceTester({ | |
pathPrefix: '/jitpack/v', | ||
}) | ||
|
||
t.create('jitpack version redirect') | ||
t.create('jitpack version redirect (no vcs)') | ||
.get('/jitpack/maven-simple.svg') | ||
.expectRedirect('/jitpack/v/github/jitpack/maven-simple.svg') | ||
.expectRedirect('/jitpack/version/com.github.jitpack/maven-simple.svg') | ||
|
||
t.create('jitpack version redirect (github)') | ||
.get('/github/jitpack/maven-simple.svg') | ||
.expectRedirect('/jitpack/version/com.github.jitpack/maven-simple.svg') | ||
Comment on lines
+13
to
+15
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,17 +11,16 @@ export default class JitPackVersion extends BaseJsonService { | |
static category = 'version' | ||
|
||
static route = { | ||
base: 'jitpack/v', | ||
pattern: ':vcs(github|bitbucket|gitlab|gitee)/:user/:repo', | ||
base: 'jitpack/version', | ||
pattern: ':groupId/:artifactId', | ||
Comment on lines
15
to
+17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Lets leave a comment linking to #8312 to explain why we're using |
||
} | ||
|
||
static examples = [ | ||
{ | ||
title: 'JitPack', | ||
namedParams: { | ||
vcs: 'github', | ||
user: 'jitpack', | ||
repo: 'maven-simple', | ||
groupId: 'com.github.jitpack', | ||
artifactId: 'maven-simple', | ||
}, | ||
staticPreview: renderVersionBadge({ version: 'v1.1' }), | ||
keywords: ['java', 'maven'], | ||
|
@@ -30,8 +29,8 @@ export default class JitPackVersion extends BaseJsonService { | |
|
||
static defaultBadgeData = { label: 'jitpack' } | ||
|
||
async fetch({ vcs, user, repo }) { | ||
const url = `https://jitpack.io/api/builds/com.${vcs}.${user}/${repo}/latestOk` | ||
async fetch({ groupId, artifactId }) { | ||
const url = `https://jitpack.io/api/builds/${groupId}/${artifactId}/latestOk` | ||
|
||
return this._requestJson({ | ||
schema, | ||
|
@@ -40,8 +39,8 @@ export default class JitPackVersion extends BaseJsonService { | |
}) | ||
} | ||
|
||
async handle({ vcs, user, repo }) { | ||
const { version } = await this.fetch({ vcs, user, repo }) | ||
async handle({ groupId, artifactId }) { | ||
const { version } = await this.fetch({ groupId, artifactId }) | ||
return renderVersionBadge({ version }) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason the tests are failing is:
we'll need to manually give each of these redirects a unique name when we declare them as the auto-generated names are clashing.
https://github.com/badges/shields/blob/master/core/base-service/redirector.js#L46-L50
You can run
npm test
locally to run the core tests and linersThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you; I couldn't get
npm install
to work... I've fixed it and was finally able to test the code.