Skip to content

Commit

Permalink
Updated scan license github action to latest go version (#541)
Browse files Browse the repository at this point in the history
* Updated scan license github action to latest go version

Signed-off-by: Corbin Phelps <[email protected]>

* Removed windows go upgrade from circle ci

Signed-off-by: Corbin Phelps <[email protected]>
  • Loading branch information
cpheps authored Feb 11, 2022
1 parent 1e0fa78 commit 41730c6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
15 changes: 8 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ executors:
xcode: 11.4.1

jobs:

build:
executor: golang
steps:
Expand Down Expand Up @@ -201,7 +200,7 @@ jobs:
name: Run Unit Tests
command: make test
- codecov/upload:
file: '**/coverage.txt'
file: "**/coverage.txt"

#test-linux-arm64:
# machine:
Expand Down Expand Up @@ -250,10 +249,11 @@ jobs:

steps:
- checkout
- run:
name: Upgrade Golang
shell: powershell.exe
command: choco upgrade golang --version=1.17
# Windows boxes now come with Go 1.17.6 installed https://circleci.com/docs/2.0/hello-world-windows/#software-pre-installed-in-the-windows-image
# - run:
# name: Upgrade Golang
# shell: powershell.exe
# command: choco upgrade golang --version=1.17
- run:
name: Install GCC
shell: powershell.exe
Expand Down Expand Up @@ -343,7 +343,8 @@ jobs:
- run:
name: Setup VM Workspace
command: gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- 'mkdir -p ~/benchmark/out' &&
command:
gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- 'mkdir -p ~/benchmark/out' &&
gcloud compute scp --ssh-key-file=~/.ssh/key ./bin/stanza << parameters.instance >>:~/benchmark/ &&
gcloud compute scp --ssh-key-file=~/.ssh/key ./bin/logbench << parameters.instance >>:~/benchmark/ &&
gcloud compute scp --ssh-key-file=~/.ssh/key ./.circleci/testdata/benchmark.yaml << parameters.instance >>:~/benchmark/config.yaml &&
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Install License Scanner
run: go install github.com/uw-labs/lichen@latest
run: go install github.com/uw-labs/lichen@v0.1.4

- name: Check out source code
uses: actions/checkout@v1
Expand All @@ -33,4 +33,4 @@ jobs:
run: lichen --config=./license.yaml "./artifacts/stanza_windows_amd64"

- name: Scan Licenses MacOS
run: lichen --config=./license.yaml "./artifacts/stanza_darwin_amd64"
run: lichen --config=./license.yaml "./artifacts/stanza_darwin_amd64"

0 comments on commit 41730c6

Please sign in to comment.