Merge pull request #553 from panva/refactor

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

Author: Sambego

.github/workflows/test.yml

@@ -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

.travis.yml

@@ -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",
@@ -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"]);
-};
+};

Gruntfile.js

@@ -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
 
 |||

README.md

@@ -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() {