Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/echarts-5.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier authored Nov 29, 2024
2 parents 373a9ab + c52a3a0 commit 9d69b8e
Show file tree
Hide file tree
Showing 4 changed files with 957 additions and 900 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand All @@ -23,15 +23,15 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache yarn
uses: actions/cache@v2
uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-

- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.7

Expand All @@ -48,14 +48,14 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache yarn
uses: actions/cache@v2
uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Installing dependencies
run: |
Expand All @@ -93,7 +93,7 @@ jobs:
run: yarn build

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"style-loader": "^3.3.4",
"style-loader": "^4.0.0",
"terser-webpack-plugin": "^5.3.10",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4",
Expand Down
1 change: 1 addition & 0 deletions src/js/netjsongraph.util.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class NetJSONGraphUtil {
"Content-Type": "application/json",
Accept: "application/json",
},
credentials: "include",
})
.then((response) => response)
.catch((msg) => {
Expand Down
Loading

0 comments on commit 9d69b8e

Please sign in to comment.