Skip to content

Commit faa9643

Browse files
Merge pull request #1 from grafana/alexander-akhmetov/fix-ci
fix(ci): resolve build failures in TS, Java, and .NET jobs
2 parents 8074365 + 9266ae6 commit faa9643

File tree

8 files changed

+45
-19
lines changed

8 files changed

+45
-19
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
persist-credentials: false
1719

1820
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1921
with:
@@ -45,6 +47,8 @@ jobs:
4547
runs-on: ubuntu-latest
4648
steps:
4749
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
50+
with:
51+
persist-credentials: false
4852

4953
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
5054

@@ -78,6 +82,8 @@ jobs:
7882
- { name: google-adk, cmd: "uv run --with './python[dev]' --with './python-frameworks/google-adk[dev]' pytest python-frameworks/google-adk/tests" }
7983
steps:
8084
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
85+
with:
86+
persist-credentials: false
8187

8288
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
8389
with:
@@ -94,6 +100,8 @@ jobs:
94100
runs-on: ubuntu-latest
95101
steps:
96102
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
103+
with:
104+
persist-credentials: false
97105

98106
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
99107
with:
@@ -110,6 +118,8 @@ jobs:
110118
runs-on: ubuntu-latest
111119
steps:
112120
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
121+
with:
122+
persist-credentials: false
113123

114124
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
115125
with:

.github/workflows/dotnet-publish.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,28 @@ jobs:
3232
export_env: false
3333

3434
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
35+
with:
36+
persist-credentials: false
3537

3638
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
3739
with:
3840
dotnet-version: '8.0.x'
3941

4042
- name: Pack
43+
env:
44+
PKG_VERSION: ${{ inputs.version }}
4145
run: |
4246
dotnet pack dotnet/Sigil.DotNet.sln -c Release \
43-
-p:PackageVersion=${{ inputs.version }} \
47+
-p:PackageVersion="${PKG_VERSION}" \
4448
-o nupkgs/
4549
4650
- name: Publish
51+
env:
52+
NUGET_API_KEY: ${{ fromJSON(steps.get-secrets.outputs.secrets).NUGET_API_KEY }}
4753
run: |
4854
for pkg in nupkgs/*.nupkg; do
4955
dotnet nuget push "$pkg" \
50-
--api-key "${{ fromJSON(steps.get-secrets.outputs.secrets).NUGET_API_KEY }}" \
56+
--api-key "${NUGET_API_KEY}" \
5157
--source https://api.nuget.org/v3/index.json \
5258
--skip-duplicate
5359
done

.github/workflows/go-sdk-tag.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ jobs:
4848
git config user.email '144369747+grafana-plugins-platform-bot[bot]@users.noreply.github.com'
4949
5050
- name: Tag all Go modules
51+
env:
52+
INPUT_VERSION: ${{ inputs.version }}
5153
run: |
52-
VERSION="v${{ inputs.version }}"
54+
VERSION="v${INPUT_VERSION}"
5355
MODULES=(
5456
go
5557
go-providers/anthropic

.github/workflows/java-publish.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
export_env: false
3636

3737
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38+
with:
39+
persist-credentials: false
3840

3941
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4042
with:
@@ -43,10 +45,16 @@ jobs:
4345

4446
- name: Publish
4547
working-directory: java
48+
env:
49+
PKG_VERSION: ${{ inputs.version }}
50+
OSSRH_USERNAME: ${{ fromJSON(steps.get-secrets.outputs.secrets).MAVEN_USERNAME }}
51+
OSSRH_PASSWORD: ${{ fromJSON(steps.get-secrets.outputs.secrets).MAVEN_PASSWORD }}
52+
SIGNING_KEY: ${{ fromJSON(steps.get-secrets.outputs.secrets).GPG_PRIVATE_KEY }}
53+
SIGNING_PASSWORD: ${{ fromJSON(steps.get-secrets.outputs.secrets).GPG_PASSPHRASE }}
4654
run: |
4755
./gradlew --no-daemon publish \
48-
-Pversion=${{ inputs.version }} \
49-
-PossrhUsername="${{ fromJSON(steps.get-secrets.outputs.secrets).MAVEN_USERNAME }}" \
50-
-PossrhPassword="${{ fromJSON(steps.get-secrets.outputs.secrets).MAVEN_PASSWORD }}" \
51-
-Psigning.key="${{ fromJSON(steps.get-secrets.outputs.secrets).GPG_PRIVATE_KEY }}" \
52-
-Psigning.password="${{ fromJSON(steps.get-secrets.outputs.secrets).GPG_PASSPHRASE }}"
56+
-Pversion="${PKG_VERSION}" \
57+
-PossrhUsername="${OSSRH_USERNAME}" \
58+
-PossrhPassword="${OSSRH_PASSWORD}" \
59+
-Psigning.key="${SIGNING_KEY}" \
60+
-Psigning.password="${SIGNING_PASSWORD}"

dotnet/tests/Grafana.Sigil.Tests/AuthConfigTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public sealed class AuthConfigTests
2828
Mode = ExportAuthMode.None,
2929
TenantId = "tenant-a",
3030
},
31-
"generation auth mode 'none' does not allow tenant_id or bearer_token"
31+
"generation auth mode 'none' does not allow credentials"
3232
},
3333
{
3434
new AuthConfig

dotnet/tests/Grafana.Sigil.Tests/Grafana.Sigil.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<Protobuf Include="../../../../sdks/js/proto/opentelemetry/proto/collector/trace/v1/trace_service.proto"
26-
ProtoRoot="../../../../sdks/js/proto"
25+
<Protobuf Include="../../../js/proto/opentelemetry/proto/collector/trace/v1/trace_service.proto"
26+
ProtoRoot="../../../js/proto"
2727
GrpcServices="Server"
2828
Link="Proto/opentelemetry/proto/collector/trace/v1/trace_service.proto" />
29-
<Protobuf Include="../../../../sdks/js/proto/opentelemetry/proto/trace/v1/trace.proto"
30-
ProtoRoot="../../../../sdks/js/proto"
29+
<Protobuf Include="../../../js/proto/opentelemetry/proto/trace/v1/trace.proto"
30+
ProtoRoot="../../../js/proto"
3131
GrpcServices="None"
3232
Link="Proto/opentelemetry/proto/trace/v1/trace.proto" />
33-
<Protobuf Include="../../../../sdks/js/proto/opentelemetry/proto/resource/v1/resource.proto"
34-
ProtoRoot="../../../../sdks/js/proto"
33+
<Protobuf Include="../../../js/proto/opentelemetry/proto/resource/v1/resource.proto"
34+
ProtoRoot="../../../js/proto"
3535
GrpcServices="None"
3636
Link="Proto/opentelemetry/proto/resource/v1/resource.proto" />
37-
<Protobuf Include="../../../../sdks/js/proto/opentelemetry/proto/common/v1/common.proto"
38-
ProtoRoot="../../../../sdks/js/proto"
37+
<Protobuf Include="../../../js/proto/opentelemetry/proto/common/v1/common.proto"
38+
ProtoRoot="../../../js/proto"
3939
GrpcServices="None"
4040
Link="Proto/opentelemetry/proto/common/v1/common.proto" />
4141
</ItemGroup>

java/settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include(":providers:anthropic")
66
include(":providers:gemini")
77
include(":frameworks:google-adk")
88
include(":benchmarks")
9-
include(":devex-emitter")
109

1110
project(":providers:openai").projectDir = file("providers/openai")
1211
project(":providers:anthropic").projectDir = file("providers/anthropic")

js/tsconfig.test.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"module": "NodeNext",
55
"moduleResolution": "NodeNext",
66
"noEmit": false,
7-
"outDir": ".test-dist"
7+
"outDir": ".test-dist",
8+
"rootDir": "./src"
89
},
910
"include": ["src/**/*.ts"]
1011
}

0 commit comments

Comments
 (0)