Skip to content

Commit

Permalink
Build updates (#128)
Browse files Browse the repository at this point in the history
- Use non-deprecated GitHub actions, avoiding ones based on Node 16.
- Use supported (Debian-based) Golang Docker images.
- Use Ubuntu 22.04

Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday authored Feb 7, 2024
1 parent fda7a56 commit 2367462
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '1.19'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
registry-url: 'https://npm.pkg.github.com'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install Tools
run: |
go install honnef.co/go/tools/cmd/staticcheck@latest
go install github.com/securego/gosec/v2/cmd/gosec@latest
go install github.com/cucumber/godog/cmd/godog@latest
Expand Down Expand Up @@ -61,4 +60,4 @@ jobs:
cd ./integrationtest
npm ci
$(npm bin)/fabric-chaincode-integration run
npx fabric-chaincode-integration run
6 changes: 3 additions & 3 deletions .github/workflows/vulnerability-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
govulncheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '^1.20'
go-version: "1.21"
check-latest: true
- name: Install govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
Expand Down
3 changes: 1 addition & 2 deletions integrationtest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# SPDX-License-Identifier: Apache-2.0

ARG GO_VER=1.19
ARG ALPINE_VER=3.16

FROM golang:${GO_VER}-alpine${ALPINE_VER}
FROM golang:${GO_VER}

WORKDIR $GOPATH/src/github.com/hyperledger/fabric-contract-api-go
COPY . .

0 comments on commit 2367462

Please sign in to comment.