Skip to content

Commit

Permalink
Merge branch 'master' into sbn-3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbakker authored Nov 6, 2024
2 parents 529ecd9 + a86ed0f commit 351120c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].2

- name: Setup Java ${{ matrix.jdk-version }}
uses: actions/setup-java@v4
Expand All @@ -28,22 +28,22 @@ jobs:
python -m pip install --upgrade pip
if [ -f scripts/requirements.txt ]; then pip install -r scripts/requirements.txt; fi
- uses: actions/[email protected].1
- uses: actions/[email protected].2
id: gradle-wrapper-cache
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
restore-keys: ${{ runner.os }}-gradlewrapper-

- name: Cache Gradle packages
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle

- name: Maven cache
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -61,13 +61,13 @@ jobs:
./gradlew --info --no-watch-fs publishToMavenLocal --warning-mode all
- name: Clone dgs-examples-java
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: Netflix/dgs-examples-java
path: build/examples/dgs-examples-java

- name: Clone dgs-examples-kotlin
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: Netflix/dgs-examples-kotlin
path: build/examples/dgs-examples-kotlin
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nebula-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].2
- name: Setup jdk 8
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
- uses: actions/[email protected].1
- uses: actions/[email protected].2
id: gradle-cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
restore-keys: |
- ${{ runner.os }}-gradle-
- uses: actions/[email protected].1
- uses: actions/[email protected].2
id: gradle-wrapper-cache
with:
path: ~/.gradle/wrapper
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].2
- name: Set up JDK 1.8
uses: actions/setup-java@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion graphql-dgs-spring-graphql-example-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-webflux")
testImplementation(project(":graphql-dgs-client"))
testImplementation("io.projectreactor:reactor-test")
testImplementation("org.springframework.graphql:spring-graphql-test:1.3.2")
testImplementation("org.springframework.graphql:spring-graphql-test:1.3.3")
testImplementation(project(":graphql-dgs-pagination"))
testImplementation(project(":graphql-dgs-extended-scalars"))
testImplementation(project(":graphql-dgs-spring-graphql-starter-test"))
Expand Down

0 comments on commit 351120c

Please sign in to comment.