Merge branch 'main' into k8sprocessor-add-ignore-pod-names-as-parameter

SumoLogic · Dec 14, 2021 · 832fc81 · 832fc81
2 parents 07a46c5 + 8c7fc3c
commit 832fc81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Check if test related files changed
         id: changed-files
-        uses: tj-actions/changed-files@v11
+        uses: tj-actions/changed-files@v12
         with:
           files: |
             pkg/
@@ -130,7 +130,7 @@ jobs:
 
       - name: Check if files changed that need linting
         id: changed-files
-        uses: tj-actions/changed-files@v11
+        uses: tj-actions/changed-files@v12
         with:
           files: |
             otelcolbuilder/cmd/
@@ -195,7 +195,7 @@ jobs:
 
       - name: Check if build related files changed
         id: changed-files
-        uses: tj-actions/changed-files@v11
+        uses: tj-actions/changed-files@v12
         with:
           files: |
             otelcolbuilder/.otelcol-builder.yaml
@@ -273,7 +273,7 @@ jobs:
 
       - name: Check if build related files changed
         id: changed-files
-        uses: tj-actions/changed-files@v11
+        uses: tj-actions/changed-files@v12
         with:
           files: |
             otelcolbuilder/.otelcol-builder.yaml

diff --git a/Dockerfile_dev b/Dockerfile_dev
@@ -10,7 +10,7 @@ RUN apk --update add ca-certificates
 FROM alpine:3.15.0 as directories
 RUN mkdir /etc/otel/
 
-FROM golang:1.17.4
+FROM golang:1.17.5
 ARG BUILD_TAG=latest
 ENV TAG $BUILD_TAG
 ARG USER_UID=10001

diff --git a/Dockerfile_local b/Dockerfile_local
@@ -1,4 +1,4 @@
-FROM golang:1.17.4-alpine as builder
+FROM golang:1.17.5-alpine as builder
 ADD . /src
 WORKDIR /src/otelcolbuilder/
 ENV CGO_ENABLED=0