From 41730c64b88e57c23af47af5a1b4d803bb6aa4b3 Mon Sep 17 00:00:00 2001 From: Corbin Phelps Date: Fri, 11 Feb 2022 08:33:08 -0500 Subject: [PATCH] Updated scan license github action to latest go version (#541) * Updated scan license github action to latest go version Signed-off-by: Corbin Phelps * Removed windows go upgrade from circle ci Signed-off-by: Corbin Phelps --- .circleci/config.yml | 15 ++++++++------- .github/workflows/license.yml | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfccd7dab..3f7f2a6f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,6 @@ executors: xcode: 11.4.1 jobs: - build: executor: golang steps: @@ -201,7 +200,7 @@ jobs: name: Run Unit Tests command: make test - codecov/upload: - file: '**/coverage.txt' + file: "**/coverage.txt" #test-linux-arm64: # machine: @@ -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 @@ -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 && diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 4ed23190f..a3480fed8 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -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 @@ -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" \ No newline at end of file + run: lichen --config=./license.yaml "./artifacts/stanza_darwin_amd64"