Skip to content

Commit

Permalink
Merge pull request #553 from panva/refactor
Browse files Browse the repository at this point in the history
refactor: reconsile key formats, update keys, support JWK, re-enable CI
  • Loading branch information
Sambego authored Sep 29, 2021
2 parents c2d7f1b + dcc527c commit 3997bdd
Show file tree
Hide file tree
Showing 25 changed files with 3,891 additions and 1,303 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/test.yml
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

This file was deleted.

14 changes: 13 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,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,11 +269,12 @@ module.exports = (grunt) => {

grunt.registerTask("functional-tests", [
"build-website-dev",
"pug:website",
"connect:website",
"mochaTest:functional",
]);

grunt.registerTask("test", ["unit-tests", "functional-tests"]);

grunt.registerTask("default", ["build-dev", "connect:website", "watch"]);
};
};
2 changes: 0 additions & 2 deletions README.md
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
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,
});

function fetchGithubStars() {
Expand Down
Loading

0 comments on commit 3997bdd

Please sign in to comment.