Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/QaisarMoin/jsPDF
Browse files Browse the repository at this point in the history
  • Loading branch information
QaisarMoin committed Oct 1, 2024
2 parents 3a7b607 + c10aeb1 commit 5ca8c2f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 29 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Continous Integration
name: Continuous Integration

on: [push, pull_request]
on: [pull_request_target]

jobs:
test-saucelabs:
name: Browser tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
Expand All @@ -34,9 +34,9 @@ jobs:
name: Node.js ${{ matrix.node-version }} test
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand All @@ -57,9 +57,9 @@ jobs:
name: Typings tests (typescript@${{ matrix.ts-version.ts }})
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
Expand All @@ -77,9 +77,9 @@ jobs:
name: Lint
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://registry.npmjs.org/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. It will be closed soon. Please comment/reopen if this issue is still relevant.'
Expand Down
4 changes: 0 additions & 4 deletions .sauce.yml

This file was deleted.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"jasmine": "3.5.0",
"jasmine-core": "3.5.0",
"jasmine-expect": "4.0.3",
"js-yaml": "3.13.1",
"jsdoc": "^3.6.3",
"karma": "5.1.0",
"karma-babel-preprocessor": "8.0.1",
Expand Down
12 changes: 1 addition & 11 deletions test/saucelabs/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Karma configuration
"use strict";
const yaml = require("js-yaml");
const fs = require("fs");
const karmaConfig = require("../karma.common.conf.js");

const browsers = {
Expand All @@ -25,24 +23,16 @@ const browsers = {
};

module.exports = config => {
// Use ENV vars or .sauce.yml to get credentials
if (
!(
process.env.SAUCE_USERNAME &&
process.env.SAUCE_ACCESS_KEY &&
process.env.SAUCE_ACCESS_KEY.length > 5
)
) {
if (!fs.existsSync(".sauce.yml")) {
// eslint-disable-next-line no-console
console.log("Create a .sauce.yml with your credentials");
console.error("Saucelabs credentials are missing. Define the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables.");
process.exit(1);
} else {
let sauceConfig = yaml.safeLoad(fs.readFileSync(".sauce.yml", "utf8"));
process.env.SAUCE_USERNAME = sauceConfig.addons.sauce_connect.username;
process.env.SAUCE_ACCESS_KEY =
sauceConfig.addons.sauce_connect.access_key;
}
}
config.set({
...karmaConfig,
Expand Down

0 comments on commit 5ca8c2f

Please sign in to comment.