Merge branch 'master' into argocd-health-check
This commit is contained in:
commit
72f146f048
|
|
@ -35,7 +35,7 @@ jobs:
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@v3
|
uses: github/codeql-action/init@v3
|
||||||
with:
|
with:
|
||||||
languages: go
|
languages: go, actions
|
||||||
|
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@v3
|
uses: github/codeql-action/autobuild@v3
|
||||||
|
|
|
||||||
2
Makefile
2
Makefile
|
|
@ -6,7 +6,7 @@ endif
|
||||||
DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
|
DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
|
||||||
VERSION ?= dev
|
VERSION ?= dev
|
||||||
COMMIT_SHA = $(shell git rev-parse HEAD)
|
COMMIT_SHA = $(shell git rev-parse HEAD)
|
||||||
RUNNER_VERSION ?= 2.325.0
|
RUNNER_VERSION ?= 2.326.0
|
||||||
TARGETPLATFORM ?= $(shell arch)
|
TARGETPLATFORM ?= $(shell arch)
|
||||||
RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
|
||||||
RUNNER_TAG ?= ${VERSION}
|
RUNNER_TAG ?= ${VERSION}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
## githubConfigUrl is the GitHub url for where you want to configure runners
|
## githubConfigUrl is the GitHub url for where you want to configure runners
|
||||||
## ex: https://github.com/myorg/myrepo or https://github.com/myorg
|
## ex: https://github.com/myorg/myrepo or https://github.com/myorg or https://github.com/enterprises/myenterprise
|
||||||
githubConfigUrl: ""
|
githubConfigUrl: ""
|
||||||
|
|
||||||
## githubConfigSecret is the k8s secret information to use when authenticating via the GitHub API.
|
## githubConfigSecret is the k8s secret information to use when authenticating via the GitHub API.
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless
|
||||||
OS_IMAGE ?= ubuntu-22.04
|
OS_IMAGE ?= ubuntu-22.04
|
||||||
TARGETPLATFORM ?= $(shell arch)
|
TARGETPLATFORM ?= $(shell arch)
|
||||||
|
|
||||||
RUNNER_VERSION ?= 2.325.0
|
RUNNER_VERSION ?= 2.326.0
|
||||||
RUNNER_CONTAINER_HOOKS_VERSION ?= 0.7.0
|
RUNNER_CONTAINER_HOOKS_VERSION ?= 0.7.0
|
||||||
DOCKER_VERSION ?= 24.0.7
|
DOCKER_VERSION ?= 24.0.7
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
RUNNER_VERSION=2.325.0
|
RUNNER_VERSION=2.326.0
|
||||||
RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
|
RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
|
||||||
|
|
@ -36,7 +36,7 @@ var (
|
||||||
|
|
||||||
testResultCMNamePrefix = "test-result-"
|
testResultCMNamePrefix = "test-result-"
|
||||||
|
|
||||||
RunnerVersion = "2.325.0"
|
RunnerVersion = "2.326.0"
|
||||||
RunnerContainerHooksVersion = "0.7.0"
|
RunnerContainerHooksVersion = "0.7.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue