Skip to content

Commit

Permalink
Merge branch 'main' into 2100_add_metricName
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorge Turrado Ferrero authored Sep 20, 2021
2 parents 1f808f5 + 02aa93a commit c04c292
Show file tree
Hide file tree
Showing 135 changed files with 4,708 additions and 1,677 deletions.
6 changes: 4 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM golang:1.15.13
FROM golang:1.16.7

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -16,6 +16,8 @@ ARG USERNAME=vscode
ARG USER_UID=1000
ARG USER_GID=$USER_UID

ENV GO111MODULE=auto

# Configure apt, install packages and tools
RUN apt-get update \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
Expand Down Expand Up @@ -53,7 +55,7 @@ RUN apt-get update \
github.com/mgechev/revive \
github.com/derekparker/delve/cmd/dlv 2>&1 \
# Install golangci-lint
&& curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1 \
&& curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.42.0 \
#
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
&& groupadd --gid $USER_GID $USERNAME \
Expand Down
17 changes: 5 additions & 12 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# Don't send .git context
.git/

# Binaries
/bin/
/keda

# Dockerfiles
Dockerfile
Dockerfile.*

*.md
# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
# Ignore all files which are not go type
!**/*.go
!**/*.mod
!**/*.sum
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "^1.15.13"
go-version: "^1.16"
- run: go version
# Runs a set of commands to initialize and analyze with FOSSA
- name: run FOSSA analysis
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
- uses: actions/[email protected]
- uses: actions/setup-go@v2
with:
go-version: 1.15.13
go-version: 1.16
- name: Get golangci
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.42.0
- uses: pre-commit/[email protected]

codeScanning:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
# Get release information to determine id of the current release
- name: Get Release
id: get-release-info
uses: bruceadams/[email protected].2
uses: bruceadams/[email protected].3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
Loading

0 comments on commit c04c292

Please sign in to comment.