Skip to content

Commit cfdf9c9

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-07a849e1ae
2 parents 614465e + efdd5a3 commit cfdf9c9

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

Diff for: .github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212

1313
- name: Setup environment
14-
uses: actions/setup-node@v3
14+
uses: actions/setup-node@v4
1515
with:
1616
node-version-file: '.nvmrc'
1717

Diff for: .github/workflows/release.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111
outputs:
1212
new_version: ${{ steps.version_check.outputs.version }}
13+
version_changed: ${{ steps.version_check.outputs.changed }}
1314
steps:
1415
- name: Checkout repository
15-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1617
with:
1718
ref: main
1819
# limit releases to version changes - https://github.com/EndBug/version-check
1920
- name: Check version changes
20-
uses: EndBug/version-check@v1
21+
uses: EndBug/version-check@v2
2122
id: version_check
2223
with:
2324
file-url: https://unpkg.com/@grafana/async-query-data@latest/package.json
@@ -29,7 +30,7 @@ jobs:
2930

3031
- name: Setup .npmrc file for NPM registry
3132
if: steps.version_check.outputs.changed == 'true'
32-
uses: actions/setup-node@v3
33+
uses: actions/setup-node@v4
3334
with:
3435
node-version-file: '.nvmrc'
3536
registry-url: 'https://registry.npmjs.org'
@@ -50,7 +51,7 @@ jobs:
5051

5152
- name: Setup .npmrc file for GitHub Packages
5253
if: steps.version_check.outputs.changed == 'true'
53-
uses: actions/setup-node@v3
54+
uses: actions/setup-node@v4
5455
with:
5556
node-version-file: '.nvmrc'
5657
registry-url: 'https://npm.pkg.github.com'
@@ -65,12 +66,13 @@ jobs:
6566
name: Create GitHub Release
6667
runs-on: ubuntu-latest
6768
needs: npm-publish
69+
if: needs.npm-publish.outputs.version_changed == 'true'
6870
steps:
6971
- name: Checkout code
70-
uses: actions/checkout@v2
72+
uses: actions/checkout@v4
7173

7274
- name: Create Release Notes
73-
uses: actions/github-script@v6.2.0
75+
uses: actions/github-script@v7.0.1
7476
with:
7577
github-token: ${{secrets.GITHUB_TOKEN}}
7678
script: |

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## v0.3.0
6+
7+
- Chore: update deps in https://github.com/grafana/grafana-async-query-data-js/pull/31
8+
59
## v0.2.0
610

711
- Remove athenaAsyncQueryDataSupport and redshiftAsyncQueryData feature toggle-related code

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@grafana/async-query-data",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"description": "Async query support for Grafana",
55
"main": "dist/index.js",
66
"module": "dist/esm/index.js",

0 commit comments

Comments
 (0)