Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java: Use gradle and workflow #433

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Java: Use gradle and workflow #433

wants to merge 3 commits into from

Conversation

spinillos
Copy link
Member

Contributes to: #360

It shouldn't be merged until we prepare some examples and a few more tests to ensure that its working as expected.

This PR creates the CI steps to be able to do the checks to the Java code and the publishing step.

Following the same way that other teams doing the publishing in Grafana, we removed the pom.xml file in favor of gradle file. Example: https://github.com/grafana/grafana-opentelemetry-starter.

It needs to setup some credentials in foundation-sdk settings to make it works.

@spinillos spinillos requested a review from a team as a code owner June 5, 2024 13:55
@spinillos spinillos marked this pull request as draft June 5, 2024 13:55
Copy link

github-actions bot commented Jun 5, 2024

Note: in addition to the changes introduced by this PR, the diff includes unreleased changes living in main.

🔎 Changes to grafana-foundation-sdk@next+cog-v0.0.x

diff --git a/python/grafana_foundation_sdk/cog/plugins.py b/python/grafana_foundation_sdk/cog/plugins.py
index ea5481d..1ddf9dd 100644
--- a/python/grafana_foundation_sdk/cog/plugins.py
+++ b/python/grafana_foundation_sdk/cog/plugins.py
@@ -1,39 +1,39 @@
 # Code generated - EDITING IS FUTILE. DO NOT EDIT.
 
-from ..models import dashboardlist
-from ..models import debug
-from ..models import histogram
-from ..models import stat
-from ..models import tempo
-from ..models import expr
-from ..models import barchart
-from ..models import datagrid
-from ..models import grafanapyroscope
-from ..models import heatmap
-from ..models import nodegraph
-from ..models import cloudwatch
-from ..models import text
-from ..models import timeseries
-from ..models import canvas
-from ..models import googlecloudmonitoring
-from ..models import loki
-from ..models import trend
-from ..models import statushistory
-from ..models import prometheus
 from ..models import annotationslist
-from ..models import statetimeline
-from ..models import bargauge
+from ..models import azuremonitor
 from ..models import gauge
 from ..models import logs
-from ..models import azuremonitor
+from ..models import nodegraph
+from ..models import statushistory
+from ..models import table
+from ..models import xychart
 from ..models import candlestick
-from ..models import elasticsearch
+from ..models import debug
+from ..models import barchart
 from ..models import piechart
-from ..models import xychart
-from ..models import geomap
+from ..models import heatmap
+from ..models import histogram
 from ..models import news
 from ..models import parca
-from ..models import table
+from ..models import stat
+from ..models import statetimeline
+from ..models import dashboardlist
+from ..models import googlecloudmonitoring
+from ..models import timeseries
+from ..models import elasticsearch
+from ..models import trend
+from ..models import bargauge
+from ..models import datagrid
+from ..models import loki
+from ..models import cloudwatch
+from ..models import geomap
+from ..models import grafanapyroscope
+from ..models import text
+from ..models import expr
+from ..models import prometheus
+from ..models import canvas
+from ..models import tempo
 from . import runtime as cogruntime
 
 
diff --git a/python/grafana_foundation_sdk/models/expr.py b/python/grafana_foundation_sdk/models/expr.py
index 0f8654e..5dd1737 100644
--- a/python/grafana_foundation_sdk/models/expr.py
+++ b/python/grafana_foundation_sdk/models/expr.py
@@ -9,7 +9,7 @@ Expr: typing.TypeAlias = typing.Union['TypeMath', 'TypeReduce', 'TypeResample',
 
 
 def variant_config() -> cogruntime.DataqueryConfig:
-    decoding_map: dict[str, typing.Union[typing.Type[TypeClassicConditions], typing.Type[TypeThreshold], typing.Type[TypeSql], typing.Type[TypeMath], typing.Type[TypeReduce], typing.Type[TypeResample]]] = {"classic_conditions": TypeClassicConditions, "threshold": TypeThreshold, "sql": TypeSql, "math": TypeMath, "reduce": TypeReduce, "resample": TypeResample}
+    decoding_map: dict[str, typing.Union[typing.Type[TypeMath], typing.Type[TypeReduce], typing.Type[TypeResample], typing.Type[TypeClassicConditions], typing.Type[TypeThreshold], typing.Type[TypeSql]]] = {"math": TypeMath, "reduce": TypeReduce, "resample": TypeResample, "classic_conditions": TypeClassicConditions, "threshold": TypeThreshold, "sql": TypeSql}
     return cogruntime.DataqueryConfig(
         identifier="__expr__",
         from_json_hook=lambda data: decoding_map[data["type"]].from_json(data),
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 7b9c1fb..4aad672 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -13,7 +13,7 @@ keywords = [
     "traces",
     "metrics"
 ]
-version = "1717501769!next"
+version = "1717595765!next"
 dependencies = []
 requires-python = ">=3.11"
 classifiers = [
diff --git a/typescript/package.json b/typescript/package.json
index 763fd20..c8a5bc5 100644
--- a/typescript/package.json
+++ b/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/grafana-foundation-sdk",
-  "version": "next-cogv0.0.x.1717501769",
+  "version": "next-cogv0.0.x.1717595765",
   "description": "A set of tools, types and libraries for building and manipulating Grafana objects.",
   "keywords": [
     "observability",

@spinillos spinillos self-assigned this Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant