Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
pull_request:
branches:
- main
- release-2.5
workflow_dispatch:

concurrency:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
push:
branches:
- main
- release-2.5
workflow_dispatch:

jobs:
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
strategy:
fail-fast: false
matrix:
publish_target: ["publishAllPublicationsToGithubPackagesRepository","publishAllPublicationsToReleaseRepository"]
publish_target:
- publishAllPublicationsToGithubPackagesRepository
- publishAllPublicationsToReleaseRepository
runs-on: ubuntu-latest
needs: test
steps:
Expand All @@ -30,7 +32,7 @@ jobs:
java-version: '11'
cache: 'gradle'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1.0.5
uses: gradle/wrapper-validation-action@v1
- name: Push to registry ${{ matrix.publish_target }}
run: |
set -xev
Expand All @@ -48,7 +50,9 @@ jobs:
strategy:
fail-fast: false
matrix:
DOCKER_REGISTRY: ["docker.io","ghcr.io"]
DOCKER_REGISTRY:
- 'docker.io'
- 'ghcr.io'
runs-on: ubuntu-latest
needs: test
permissions:
Expand All @@ -62,15 +66,14 @@ jobs:
java-version: '11'
cache: 'gradle'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1.0.5
uses: gradle/wrapper-validation-action@v1
- name: Build the depencies needed for the image
uses: gradle/gradle-build-action@v2.3.3
uses: gradle/gradle-build-action@v2
with:
arguments: |
:fabric-chaincode-docker:copyAllDeps -x dependencyCheckAnalyze
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
Expand All @@ -84,7 +87,6 @@ jobs:
registry: ${{ matrix.DOCKER_REGISTRY }}
username: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }}
password: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ on:
jobs:
main:
uses: ./.github/workflows/test.yml
# Requires a test.yml to exist in the release-2.5 branch to implement the release-2.5 specific build/test steps, since
# they are different from the main branch.
#
# release-2_5:
# name: release-2.5
# uses: hyperledger/fabric-chaincode-java/.github/workflows/test.yml@release-2.5
# with:
# checkout-ref: release-2.5

release-2_5:
name: release-2.5
uses: hyperledger/fabric-chaincode-java/.github/workflows/test.yml@release-2.5
with:
checkout-ref: release-2.5
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
java-version: '11'
cache: 'gradle'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
uses: gradle/wrapper-validation-action@v1
- name: Dependency Check
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
uses: gradle/gradle-build-action@v2
with:
arguments: |
:fabric-chaincode-shim:dependencyCheckAnalyze
- name: Build and Unit test
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
uses: gradle/gradle-build-action@v2
with:
arguments: |
:fabric-chaincode-shim:build
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
peer version
weft --version
- name: Integration Tests
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
uses: gradle/gradle-build-action@v2
with:
arguments: |
:fabric-chaincode-integration-test:build
Expand Down