Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GHA: Use ubuntu-20.04 for local forks #1202

Merged
merged 1 commit into from
Apr 30, 2024
Merged

GHA: Use ubuntu-20.04 for local forks #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/actions/fsat-setup/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ inputs:
default: v0.25.3
fabric-version:
description: Version of Hyperledger Fabric
default: '2.5.4'
default: '2.5.7'
ca-version:
description: Version of Hyperledger Fabric CA
default: '1.5.7'
default: '1.5.10'

runs:
using: "composite"
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/test-network-setup/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
inputs:
go-version:
description: Version of go
default: '1.20'
default: '1.21'
node-version:
description: Version of node
default: 18.x
Expand All @@ -12,10 +12,10 @@ inputs:
default: 11.x
fabric-version:
description: Version of Hyperledger Fabric
default: 2.5.4
default: 2.5.7
ca-version:
description: Version of Hyperledger Fabric CA
default: 1.5.7
default: 1.5.10

runs:
using: "composite"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ concurrency:
cancel-in-progress: true

env:
GO_VER: '1.20'
GO_VER: '1.21'
NODE_VER: 18.x
JAVA_VER: 11.x

jobs:
go:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/setup-go@v5
with:
Expand All @@ -32,7 +32,7 @@ jobs:
- run: ci/scripts/lint-go.sh

typescript:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand All @@ -41,7 +41,7 @@ jobs:
- run: ci/scripts/lint-typescript.sh

javascript:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand All @@ -50,7 +50,7 @@ jobs:
- run: ci/scripts/lint-javascript.sh

java:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -60,7 +60,7 @@ jobs:
- run: ci/scripts/lint-java.sh

shell:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- run: ci/scripts/lint-shell.sh
2 changes: 1 addition & 1 deletion .github/workflows/rest-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:

jobs:
test-sample:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}

steps:
- name: Checkout
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-fsat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
ansible:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
Expand All @@ -23,7 +23,7 @@ jobs:
working-directory: full-stack-asset-transfer-guide

appdev:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
Expand All @@ -32,7 +32,7 @@ jobs:
working-directory: full-stack-asset-transfer-guide

chaincode:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
Expand All @@ -41,7 +41,7 @@ jobs:
working-directory: full-stack-asset-transfer-guide

cloud:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
Expand All @@ -50,7 +50,7 @@ jobs:
working-directory: full-stack-asset-transfer-guide

console:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- uses: actions/checkout@v4
- name: Set up Full Stack Runtime
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-basic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
basic:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-events.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
events:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
gateway:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-hsm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
hsm:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-network-k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
ccaas-java:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -29,7 +29,7 @@ jobs:
CHAINCODE_LANGUAGE: java

ccaas-external:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -41,7 +41,7 @@ jobs:
CHAINCODE_LANGUAGE: external

k8s-builder:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -54,7 +54,7 @@ jobs:
CHAINCODE_BUILDER: k8s

multi-namespace:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-ledger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
basic:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-off-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
off-chain:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-private.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
private:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-sbe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
SBE:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-secured.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
secured:
runs-on: fabric-ubuntu-20.04
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
strategy:
matrix:
chaincode-language:
Expand Down
Loading