Skip to content

Commit

Permalink
Avoid deprecated usage of gradle actions in build (#341)
Browse files Browse the repository at this point in the history
For details, see:

github.com/gradle/actions/blob/main/docs/deprecation-upgrade-guide.md

Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday authored Apr 30, 2024
1 parent bce2603 commit 19cfb1c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 19 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ jobs:
java-version: '11'
cache: 'gradle'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
- uses: gradle/actions/setup-gradle@v3
- name: Push to registry ${{ matrix.publish_target }}
run: |
set -xev
Expand Down Expand Up @@ -67,12 +68,10 @@ jobs:
java-version: '11'
cache: 'gradle'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
- uses: gradle/actions/setup-gradle@v3
- name: Build the dependencies needed for the image
uses: gradle/actions/setup-gradle@v3
with:
arguments: |
:fabric-chaincode-docker:copyAllDeps
run: ./gradlew :fabric-chaincode-docker:copyAllDeps
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ jobs:
distribution: 'temurin'
java-version: '11'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
- uses: gradle/actions/setup-gradle@v3
- name: Build and Unit test
uses: gradle/actions/setup-gradle@v3
with:
arguments: |
:fabric-chaincode-shim:build
run: ./gradlew :fabric-chaincode-shim:build

intergationtest:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -60,11 +58,9 @@ jobs:
run: |
peer version
weft --version
- uses: gradle/actions/setup-gradle@v3
- name: Integration Tests
uses: gradle/actions/setup-gradle@v3
with:
arguments: |
:fabric-chaincode-integration-test:build
run: ./gradlew :fabric-chaincode-integration-test:build

docker:
runs-on: ubuntu-latest
Expand All @@ -76,8 +72,6 @@ jobs:
with:
distribution: 'temurin'
java-version: '11'
- uses: gradle/actions/setup-gradle@v3
- name: Build Docker image
uses: gradle/actions/setup-gradle@v3
with:
arguments: |
:fabric-chaincode-docker:buildImage
run: ./gradlew :fabric-chaincode-docker:buildImage

0 comments on commit 19cfb1c

Please sign in to comment.