Skip to content

Commit 1d7cd95

Browse files
committed
Disable patch, upgrade kotlin version.
1 parent 269e522 commit 1d7cd95

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

.github/workflows/pr-build.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,35 @@ env:
88
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
99

1010
jobs:
11-
testpatch:
12-
name: Test patches applied to dependencies
13-
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
14-
steps:
15-
- uses: actions/checkout@v4
16-
17-
- uses: actions/setup-java@v4
18-
with:
19-
java-version: 21
20-
distribution: temurin
21-
# vaadin 14 tests fail with node 18
22-
- name: Set up Node
23-
uses: actions/setup-node@v4
24-
with:
25-
node-version: 16
26-
27-
# vaadin tests use pnpm
28-
- name: Cache pnpm modules
29-
uses: actions/cache@v3
30-
with:
31-
path: ~/.pnpm-store
32-
key: ${{ runner.os }}-test-cache-pnpm-modules
33-
34-
- uses: gradle/wrapper-validation-action@v1
35-
36-
- uses: ./.github/actions/patch-dependencies
37-
with:
38-
run_tests: "true"
39-
11+
# testpatch:
12+
# name: Test patches applied to dependencies
13+
# runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
14+
# steps:
15+
# - uses: actions/checkout@v4
16+
#
17+
# - uses: actions/setup-java@v4
18+
# with:
19+
# java-version: 21
20+
# distribution: temurin
21+
# # vaadin 14 tests fail with node 18
22+
# - name: Set up Node
23+
# uses: actions/setup-node@v4
24+
# with:
25+
# node-version: 16
26+
#
27+
# # vaadin tests use pnpm
28+
# - name: Cache pnpm modules
29+
# uses: actions/cache@v3
30+
# with:
31+
# path: ~/.pnpm-store
32+
# key: ${{ runner.os }}-test-cache-pnpm-modules
33+
#
34+
# - uses: gradle/wrapper-validation-action@v1
35+
#
36+
# - uses: ./.github/actions/patch-dependencies
37+
# with:
38+
# run_tests: "true"
39+
#
4040
build:
4141
name: Build on ${{ matrix.os }}
4242
runs-on: ${{ matrix.os }}
@@ -71,9 +71,9 @@ jobs:
7171
~/.m2/repository/io/opentelemetry/
7272
key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
7373

74-
- name: Publish patched dependencies to maven local
75-
uses: ./.github/actions/patch-dependencies
76-
if: ${{ matrix.os != 'windows-latest' }} # Skip patch on windows as it is not possible to build opentelemetry-java on windows
74+
# - name: Publish patched dependencies to maven local
75+
# uses: ./.github/actions/patch-dependencies
76+
# if: ${{ matrix.os != 'windows-latest' }} # Skip patch on windows as it is not possible to build opentelemetry-java on windows
7777

7878
- name: Build with Gradle with Integration tests
7979
uses: gradle/gradle-build-action@v3

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2121
plugins {
2222
java
2323

24-
// kotlin("jvm") version "2.1.0-RC2"
24+
kotlin("jvm") version "2.1.0-RC2"
2525
// id("com.diffplug.spotless") version "6.25.0"
2626
id("com.diffplug.spotless")
2727
id("com.github.jk1.dependency-license-report")

0 commit comments

Comments
 (0)