From e43e5979c07c947b92420ff6e068f3ae59da2113 Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Sun, 13 Nov 2022 05:55:41 -0500 Subject: [PATCH] Apply review comments - pin java, node, and go runtimes Signed-off-by: Josh Kneubuhl --- .github/workflows/lint.yaml | 14 +++----- .github/workflows/test-fsat-appdev.yaml | 33 +++++++++++-------- .github/workflows/test-network-basic.yaml | 16 ++++----- .github/workflows/test-network-gateway.yaml | 16 ++++----- .github/workflows/test-network-hsm.yaml | 16 ++++----- .../test-network-off-chain-data.yaml | 16 ++++----- 6 files changed, 52 insertions(+), 59 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 2003533d..6fce7c45 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -9,13 +9,9 @@ on: push: branches: - main - - release-1.4 - - release-2.2 pull_request: branches: - main - - release-1.4 - - release-2.2 env: GO_VER: 1.18.3 @@ -24,7 +20,7 @@ env: jobs: go: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/setup-go@v3 with: @@ -34,7 +30,7 @@ jobs: - run: ci/scripts/lint-go.sh typescript: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -43,7 +39,7 @@ jobs: - run: ci/scripts/lint-typescript.sh javascript: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -52,7 +48,7 @@ jobs: - run: ci/scripts/lint-javascript.sh java: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -62,7 +58,7 @@ jobs: - run: ci/scripts/lint-java.sh shell: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - run: ci/scripts/lint-shell.sh diff --git a/.github/workflows/test-fsat-appdev.yaml b/.github/workflows/test-fsat-appdev.yaml index 88d225bb..1849ec84 100644 --- a/.github/workflows/test-fsat-appdev.yaml +++ b/.github/workflows/test-fsat-appdev.yaml @@ -9,34 +9,39 @@ on: paths: - "full-stack-asset-transfer-guide/**" +env: + GO_VER: 1.18.3 + NODE_VER: 16.x + K9S_VERSION: v0.25.3 + JUST_VERSION: 1.2.0 + jobs: - test-fsat-appdev: - runs-on: ubuntu-latest + appdev: + runs-on: ubuntu-20.04 steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - uses: actions/checkout@v3 - - name: checkout - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ${{ env.GO_VER }} - - name: k9s - env: - K9S_VERSION: v0.25.3 + - uses: actions/setup-node@v3 + with: + node-version: ${{ env.NODE_VER }} + + - name: Install k9s run: | curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/${K9S_VERSION}/k9s_Linux_x86_64.tar.gz -o /tmp/k9s_Linux_x86_64.tar.gz tar -zxf /tmp/k9s_Linux_x86_64.tar.gz -C /usr/local/bin k9s sudo chown root /usr/local/bin/k9s sudo chmod 755 /usr/local/bin/k9s - - name: just - env: - JUST_VERSION: 1.2.0 + - name: Install just run: | curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --tag ${JUST_VERSION} --to /usr/local/bin - - name: weft + - name: Install weft run: | npm install -g @hyperledger-labs/weft diff --git a/.github/workflows/test-network-basic.yaml b/.github/workflows/test-network-basic.yaml index d679f4e6..916ba1e6 100644 --- a/.github/workflows/test-network-basic.yaml +++ b/.github/workflows/test-network-basic.yaml @@ -5,14 +5,14 @@ on: workflow_dispatch: push: branches: - - "main" + - main pull_request: branches: - - "main" + - main jobs: - test-network-basic: - runs-on: ubuntu-latest + basic: + runs-on: ubuntu-20.04 strategy: matrix: @@ -23,8 +23,6 @@ jobs: - java steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - name: checkout uses: actions/checkout@v3 @@ -33,12 +31,12 @@ jobs: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary echo ${PWD}/bin >> $GITHUB_PATH + - name: Pull Fabric Docker Images + run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker + - name: Install retry CLI run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry - - name: Pull Fabric Docker Images - run: ./ci/scripts/pullFabricImages.sh - - name: Run Test Network Basic working-directory: test-network env: diff --git a/.github/workflows/test-network-gateway.yaml b/.github/workflows/test-network-gateway.yaml index c58f9ea1..3fdb4727 100644 --- a/.github/workflows/test-network-gateway.yaml +++ b/.github/workflows/test-network-gateway.yaml @@ -5,14 +5,14 @@ on: workflow_dispatch: push: branches: - - "main" + - main pull_request: branches: - - "main" + - main jobs: - test-network-gateway: - runs-on: ubuntu-latest + gateway: + runs-on: ubuntu-20.04 strategy: matrix: @@ -23,8 +23,6 @@ jobs: - java steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - name: checkout uses: actions/checkout@v3 @@ -33,12 +31,12 @@ jobs: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary echo ${PWD}/bin >> $GITHUB_PATH + - name: Pull Fabric Docker Images + run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker + - name: Install retry CLI run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry - - name: Pull Fabric Docker Images - run: ./ci/scripts/pullFabricImages.sh - - name: Run Test Network Off Chain working-directory: test-network env: diff --git a/.github/workflows/test-network-hsm.yaml b/.github/workflows/test-network-hsm.yaml index bc7d539e..da7c6ef2 100644 --- a/.github/workflows/test-network-hsm.yaml +++ b/.github/workflows/test-network-hsm.yaml @@ -5,14 +5,14 @@ on: workflow_dispatch: push: branches: - - "main" + - main pull_request: branches: - - "main" + - main jobs: - test-network-hsm: - runs-on: ubuntu-latest + hsm: + runs-on: ubuntu-20.04 strategy: matrix: @@ -23,19 +23,17 @@ jobs: - java steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - name: checkout uses: actions/checkout@v3 - - name: Pull Fabric Docker Images - run: ./ci/scripts/pullFabricImages.sh - - name: Install fabric CLI run: | curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary echo ${PWD}/bin >> $GITHUB_PATH + - name: Pull Fabric Docker Images + run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker + - name: Install retry CLI run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry diff --git a/.github/workflows/test-network-off-chain-data.yaml b/.github/workflows/test-network-off-chain-data.yaml index 43405535..b6e011ae 100644 --- a/.github/workflows/test-network-off-chain-data.yaml +++ b/.github/workflows/test-network-off-chain-data.yaml @@ -5,14 +5,14 @@ on: workflow_dispatch: push: branches: - - "main" + - main pull_request: branches: - - "main" + - main jobs: - test-network-off-chain: - runs-on: ubuntu-latest + off-chain: + runs-on: ubuntu-20.04 strategy: matrix: @@ -23,8 +23,6 @@ jobs: - java steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - name: checkout uses: actions/checkout@v3 @@ -33,12 +31,12 @@ jobs: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary echo ${PWD}/bin >> $GITHUB_PATH + - name: Pull Fabric Docker Images + run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker + - name: Install retry CLI run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry - - name: Pull Fabric Docker Images - run: ./ci/scripts/pullFabricImages.sh - - name: Run Test Network Off Chain working-directory: test-network env: