Skip to content
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

Jump to bottom

refactor: reconsile key formats, update keys, support JWK, re-enable CI #553

Merged
merged 4 commits into from
Sep 29, 2021
Merged

refactor: reconsile key formats, update keys, support JWK, re-enable CI #553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caae024
refactor: reconsile key formats, update keys, support JWK
panva Sep 27, 2021
6a4dd7e
test: remove test specific vectors
panva Sep 27, 2021
7bfe720
refactor: populate publicKey with a JWK when one is downloaded
panva Sep 27, 2021
dcc527c
Remove duplicate require
Sambego Sep 29, 2021
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
24 changes: 24 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: CI

on:
push:
paths-ignore:
- "views/website/libraries/*.json"
pull_request:
paths-ignore:
- "views/website/libraries/*.json"

jobs:
test:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
node-version: '14'
- run: npm install
- run: npm test
11 changes: 0 additions & 11 deletions .travis.yml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = (grunt) => {
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-contrib-stylus");
grunt.loadNpmTasks("grunt-contrib-pug");
grunt.loadNpmTasks("grunt-contrib-pug");
grunt.loadNpmTasks("grunt-webpack");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-clean");
Expand Down Expand Up @@ -119,6 +120,17 @@ module.exports = (grunt) => {
},

pug: {
website: {
options: {
data: {
languages: getLanguages(),
},
},
files: {
"dist/website/index.html": "views/website/index.pug",
"dist/website/introduction/index.html": "views/website/introduction.pug",
},
},
extension: {
files: {
"dist/extension/index.html": "views/extension/index.pug",
Expand Down Expand Up @@ -258,6 +270,7 @@ module.exports = (grunt) => {

grunt.registerTask("functional-tests", [
"build-website-dev",
"pug:website",
"connect:website",
"mochaTest:functional",
]);
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<img src="https://cdn.auth0.com/blog/jwtio/jwtio.png"/>

[![Build Status](https://travis-ci.org/jsonwebtoken/jsonwebtoken.github.io.png?branch=master)](https://travis-ci.org/jsonwebtoken/jsonwebtoken.github.io)

### Sponsor

|||
Expand Down
2 changes: 1 addition & 1 deletion libraries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { Octokit } = require("@octokit/rest");
const dotenv = require("dotenv").config();
const getLanguages = require("./views/website/libraries/support/get-languages.js");
const octokit = new Octokit({
auth: process.env.GITHUB,
auth: process.env.GITHUB || process.env.GITHUB_TOKEN,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in GitHub Actions a read-only GITHUB_TOKEN environment variable is always present

});

function fetchGithubStars() {
Expand Down
Loading