Skip to content

Commit

Permalink
Update to Grafana 11.3 and dependencies (#249)
Browse files Browse the repository at this point in the history
* Update to Grafana 11.3 and dependencies

* Add dependency
  • Loading branch information
mikhail-vl authored Oct 25, 2024
1 parent f552c80 commit f11a2a0
Show file tree
Hide file tree
Showing 6 changed files with 1,430 additions and 1,107 deletions.
40 changes: 37 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main

jobs:
tests:
dev:
runs-on: ubuntu-latest

steps:
Expand All @@ -18,8 +18,8 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
node-version: "20"
cache: "npm"

- name: Install dependencies
run: npm install
Expand All @@ -42,3 +42,37 @@ jobs:
name: playwright-report
path: playwright-report/
retention-days: 30

dependency:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: "20"
cache: "npm"

- name: Install dependencies
run: npm install

- name: Build
run: npm run build

- name: Start Grafana
run: docker compose --profile dependency up -d

- name: Run e2e tests
run: npm run test:e2e:docker

- name: Stop Grafana
run: docker compose down

- uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: playwright-report-dependency
path: playwright-report/
retention-days: 30
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Changelog

## 3.8.0 (IN PROGRESS)
## 3.8.0 (2024-10-25)

### Features / Enhancements

- Added Multi Day Events in Yearly View (#243)
- Updated Migration for thresholds color filter (#248)
- Updated useRuntimeVariables hook for Scenes dashboards (#247)
- Updated to Grafana 11.3 and dependencies (#248)

## 3.7.0 (2024-09-15)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![Calendar](https://github.com/VolkovLabs/business-calendar/raw/main/src/img/screenshot.png)

![Grafana](https://img.shields.io/badge/Grafana-11.2-orange)
![Grafana](https://img.shields.io/badge/Grafana-11.3-orange)
![CI](https://github.com/volkovlabs/business-calendar/workflows/CI/badge.svg)
![E2E](https://github.com/volkovlabs/business-calendar/workflows/E2E/badge.svg)
[![codecov](https://codecov.io/gh/VolkovLabs/business-calendar/branch/main/graph/badge.svg)](https://codecov.io/gh/VolkovLabs/business-calendar)
Expand Down
14 changes: 14 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ services:
profiles:
- main

grafana-dep:
image: grafana/grafana:10.0.0
ports:
- 3000:3000/tcp
environment:
- GF_DEFAULT_APP_MODE=development
- GF_USERS_DEFAULT_THEME=light
- GF_INSTALL_PLUGINS=marcusolsson-json-datasource,marcusolsson-static-datasource
volumes:
- ./dist:/var/lib/grafana/plugins/volkovlabs-calendar-panel
- ./provisioning:/etc/grafana/provisioning
profiles:
- dependency

test:
build:
context: .
Expand Down
Loading

0 comments on commit f11a2a0

Please sign in to comment.