mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-20 14:53:42 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff4f626871 | ||
|
|
bcc0b715cd | ||
|
|
0e4c8b6b78 | ||
|
|
1f2ea1b83a | ||
|
|
891f3fde38 | ||
|
|
4f59e3e418 | ||
|
|
c2046d597c | ||
|
|
645b17de72 | ||
|
|
0dfec377d2 |
No files matched your search
@@ -87,7 +87,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
|
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4
|
uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
|
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4
|
uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|||||||
@@ -57,6 +57,15 @@ jobs:
|
|||||||
make coverage-report
|
make coverage-report
|
||||||
cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY"
|
cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
|
||||||
|
cross:
|
||||||
|
name: cross-compile
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
|
- uses: ./.gitea/actions/go-setup
|
||||||
|
- name: cross-compile
|
||||||
|
run: make cross-check
|
||||||
|
|
||||||
windows:
|
windows:
|
||||||
name: test on windows
|
name: test on windows
|
||||||
runs-on: ubuntu-latest-kvm
|
runs-on: ubuntu-latest-kvm
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
- Read `DEVELOPMENT.md` for internals and conventions
|
- Read `DEVELOPMENT.md` for internals and conventions
|
||||||
- Ensure no trailing whitespace in edited files
|
- Ensure no trailing whitespace in edited files
|
||||||
- Run `make fmt` after `.go` edits, `make tidy` after `go.mod` edits, and `make checks` for the non-lint source checks
|
- Run `make fmt` after `.go` edits, `make tidy` after `go.mod` edits, and `make checks` for the non-lint source checks
|
||||||
- Lint what changed with `make lint-go`, and `make lint-go-windows` for Windows and platform-split files
|
- Lint what changed with `make lint-go`, and `make lint-go-windows` for Windows and platform-split files. Run `make cross-check` after platform-split edits
|
||||||
- Fix the cause rather than disabling a linter or weakening a test. Where unavoidable, use the narrowest scope with a trailing comment giving the reason
|
- Fix the cause rather than disabling a linter or weakening a test. Where unavoidable, use the narrowest scope with a trailing comment giving the reason
|
||||||
- Run single go tests with `go test -run '^TestName$' ./modulepath/`. `make test` self-skips the integration tests without docker or network, `make test-dind` runs the daemon-facing tests against the built dind image
|
- Run single go tests with `go test -run '^TestName$' ./modulepath/`. `make test` self-skips the integration tests without docker or network, `make test-dind` runs the daemon-facing tests against the built dind image
|
||||||
- Write the fewest, fastest tests covering the behavior, extending an existing one where possible. Prefer unit tests where logic is testable in isolation
|
- Write the fewest, fastest tests covering the behavior, extending an existing one where possible. Prefer unit tests where logic is testable in isolation
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ GO ?= go
|
|||||||
EXECUTABLE := gitea-runner$(shell $(GO) env GOEXE)
|
EXECUTABLE := gitea-runner$(shell $(GO) env GOEXE)
|
||||||
HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
|
HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
|
||||||
|
|
||||||
PODMAN_TEST_IMAGE ?= quay.io/containers/podman:v5.8.9-immutable@sha256:87f42f37fa85b421664c30b8f5f9cfc23920057f5e5fcadf0b6f68d9edc6d415 # renovate: datasource=docker
|
PODMAN_TEST_IMAGE ?= quay.io/containers/podman:v6.1.3-immutable@sha256:1d844fd1fc6ce68c1e72ae19550cc3caef039306219ee007d88f7e67c5df4dd1 # renovate: datasource=docker
|
||||||
E2E_JOB_IMAGE ?= docker.gitea.com/runner-images:ubuntu-latest@sha256:b96ba465021b1a4c6a1c9e79220c2b9bfad0f29b09dbb528bbfb35411443a3a4 # renovate: datasource=docker
|
E2E_JOB_IMAGE ?= docker.gitea.com/runner-images:ubuntu-latest@sha256:139605d4a6ab61e48dfd7687b11184881c2d7fcf06bf739e9cadb34f73deb51d # renovate: datasource=docker
|
||||||
SERVICE_IMAGE ?= nginx:1.31.7-alpine@sha256:892bb2152464f0c5d8972593a5f5afaf8054552580b699d95f8ff4af08c2d33d # renovate: datasource=docker
|
SERVICE_IMAGE ?= nginx:1.31.7-alpine@sha256:892bb2152464f0c5d8972593a5f5afaf8054552580b699d95f8ff4af08c2d33d # renovate: datasource=docker
|
||||||
E2E_GITEA_IMAGE ?= gitea/gitea:main-nightly
|
E2E_GITEA_IMAGE ?= gitea/gitea:main-nightly
|
||||||
E2E_K3S_IMAGE ?= rancher/k3s:v1.37.2-k3s1@sha256:21ea6e0fac4e3930c2ce8aa40ddd41a8b18cb3e9a0222c030dc005e7e88c4332 # renovate: datasource=docker
|
E2E_K3S_IMAGE ?= rancher/k3s:v1.37.2-k3s1@sha256:21ea6e0fac4e3930c2ce8aa40ddd41a8b18cb3e9a0222c030dc005e7e88c4332 # renovate: datasource=docker
|
||||||
@@ -21,6 +21,8 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected] # renovate: data
|
|||||||
|
|
||||||
GOTEST_FLAGS ?= -race -timeout 20m -parallel 8
|
GOTEST_FLAGS ?= -race -timeout 20m -parallel 8
|
||||||
|
|
||||||
|
CROSS_TARGETS ?= darwin/arm64 freebsd/amd64 linux/arm netbsd/amd64 openbsd/amd64 solaris/amd64 # one per platform file set, linux/arm for 32-bit syscall fields
|
||||||
|
|
||||||
STATIC ?=
|
STATIC ?=
|
||||||
EXTLDFLAGS ?=
|
EXTLDFLAGS ?=
|
||||||
ifneq ($(STATIC),)
|
ifneq ($(STATIC),)
|
||||||
@@ -100,6 +102,12 @@ deps-tools: ## install tool dependencies
|
|||||||
.PHONY: checks
|
.PHONY: checks
|
||||||
checks: tidy-check fmt-check security-check ## run the non-lint source checks
|
checks: tidy-check fmt-check security-check ## run the non-lint source checks
|
||||||
|
|
||||||
|
.PHONY: cross-check
|
||||||
|
cross-check: $(addprefix cross-check/,$(CROSS_TARGETS)) ## check that code and tests compile on every supported platform
|
||||||
|
|
||||||
|
cross-check/%:
|
||||||
|
GOOS=$(word 1,$(subst /, ,$*)) GOARCH=$(word 2,$(subst /, ,$*)) CGO_ENABLED=0 $(GO) vet -gcflags='all=-N -l' ./...
|
||||||
|
|
||||||
.PHONY: lint
|
.PHONY: lint
|
||||||
lint: lint-go lint-go-windows ## lint everything
|
lint: lint-go lint-go-windows ## lint everything
|
||||||
|
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ type JobCredential struct {
|
|||||||
Ref string `json:"ref"`
|
Ref string `json:"ref"`
|
||||||
BaseRef string `json:"base_ref"`
|
BaseRef string `json:"base_ref"`
|
||||||
DefaultRef string `json:"default_ref"`
|
DefaultRef string `json:"default_ref"`
|
||||||
|
CacheMode string `json:"cache_mode"` // empty allows everything
|
||||||
|
|
||||||
// Results is the instance whose artifact service this server forwards for the job, and
|
// Results is the instance whose artifact service this server forwards for the job, and
|
||||||
// InsecureTLS how the runner reaches it; see results.go.
|
// InsecureTLS how the runner reaches it; see results.go.
|
||||||
@@ -218,10 +219,10 @@ func StartHandler(opts Options) (*Handler, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
router := http.NewServeMux()
|
router := http.NewServeMux()
|
||||||
router.HandleFunc("GET "+apiPath+"/cache", h.bearerAuth(h.find))
|
router.HandleFunc("GET "+apiPath+"/cache", h.cacheModeAuth(false, h.find))
|
||||||
router.HandleFunc("POST "+apiPath+"/caches", h.bearerAuth(h.reserve))
|
router.HandleFunc("POST "+apiPath+"/caches", h.cacheModeAuth(true, h.reserve))
|
||||||
router.HandleFunc("PATCH "+apiPath+"/caches/{id}", h.bearerAuth(h.upload))
|
router.HandleFunc("PATCH "+apiPath+"/caches/{id}", h.cacheModeAuth(true, h.upload))
|
||||||
router.HandleFunc("POST "+apiPath+"/caches/{id}", h.bearerAuth(h.commit))
|
router.HandleFunc("POST "+apiPath+"/caches/{id}", h.cacheModeAuth(true, h.commit))
|
||||||
router.HandleFunc("POST "+apiPath+"/clean", h.bearerAuth(h.clean))
|
router.HandleFunc("POST "+apiPath+"/clean", h.bearerAuth(h.clean))
|
||||||
// Artifact GET is signed via query-string HMAC because @actions/cache
|
// Artifact GET is signed via query-string HMAC because @actions/cache
|
||||||
// does not attach Authorization when downloading archiveLocation.
|
// does not attach Authorization when downloading archiveLocation.
|
||||||
@@ -956,6 +957,30 @@ func (h *Handler) bearerAuth(handler http.HandlerFunc) http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// cacheModeAuth is bearerAuth refusing what the job's cache-mode forbids, in the shapes the toolkit reports as a warning.
|
||||||
|
func (h *Handler) cacheModeAuth(write bool, handler http.HandlerFunc) http.HandlerFunc {
|
||||||
|
return h.bearerAuth(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
mode := credFromContext(r.Context()).CacheMode
|
||||||
|
access, forbidden := "read", "write-only"
|
||||||
|
if write {
|
||||||
|
access, forbidden = "write", "read"
|
||||||
|
}
|
||||||
|
if mode != "none" && mode != forbidden {
|
||||||
|
handler(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
message := fmt.Sprintf("cache %s denied: the job's cache-mode is %s", access, mode)
|
||||||
|
switch {
|
||||||
|
case !strings.HasPrefix(r.URL.Path, cacheServiceV2Path):
|
||||||
|
h.responseJSON(w, r, http.StatusForbidden, map[string]any{"message": message})
|
||||||
|
case write:
|
||||||
|
h.responseJSON(w, r, http.StatusOK, map[string]any{"ok": false, "message": message})
|
||||||
|
default:
|
||||||
|
h.twirpError(w, r, twirpDenied, errors.New(message))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) unauthorized(w http.ResponseWriter, r *http.Request, err error) {
|
func (h *Handler) unauthorized(w http.ResponseWriter, r *http.Request, err error) {
|
||||||
if strings.HasPrefix(r.URL.Path, cacheServiceV2Path) {
|
if strings.HasPrefix(r.URL.Path, cacheServiceV2Path) {
|
||||||
h.twirpError(w, r, twirpUnauthenticated, err)
|
h.twirpError(w, r, twirpUnauthenticated, err)
|
||||||
|
|||||||
@@ -1003,7 +1003,7 @@ func TestHandler_UnregisterRevokes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHandler_CrossRepoIsolation(t *testing.T) {
|
func TestHandler_CrossRepoAndCacheModeIsolation(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
dir := filepath.Join(t.TempDir(), "artifactcache")
|
dir := filepath.Join(t.TempDir(), "artifactcache")
|
||||||
handler, err := StartHandler(Options{Dir: dir})
|
handler, err := StartHandler(Options{Dir: dir})
|
||||||
@@ -1012,6 +1012,8 @@ func TestHandler_CrossRepoIsolation(t *testing.T) {
|
|||||||
handler.RegisterJob("token-a", JobCredential{Repo: "owner/repoA"})
|
handler.RegisterJob("token-a", JobCredential{Repo: "owner/repoA"})
|
||||||
handler.RegisterJob("token-b", JobCredential{Repo: "owner/repoB"})
|
handler.RegisterJob("token-b", JobCredential{Repo: "owner/repoB"})
|
||||||
handler.RegisterJob("token-a-pull", JobCredential{Repo: "owner/repoA", Ref: "refs/pull/1/head"})
|
handler.RegisterJob("token-a-pull", JobCredential{Repo: "owner/repoA", Ref: "refs/pull/1/head"})
|
||||||
|
handler.RegisterJob("token-a-read", JobCredential{Repo: "owner/repoA", CacheMode: "read"})
|
||||||
|
handler.RegisterJob("token-a-write-only", JobCredential{Repo: "owner/repoA", CacheMode: "write-only"})
|
||||||
|
|
||||||
base := handler.ExternalURL() + apiPath
|
base := handler.ExternalURL() + apiPath
|
||||||
key := "shared-key"
|
key := "shared-key"
|
||||||
@@ -1041,12 +1043,31 @@ func TestHandler_CrossRepoIsolation(t *testing.T) {
|
|||||||
resp.Body.Close()
|
resp.Body.Close()
|
||||||
assert.Equal(t, http.StatusNoContent, resp.StatusCode)
|
assert.Equal(t, http.StatusNoContent, resp.StatusCode)
|
||||||
|
|
||||||
resp, err = clientA.Get(fmt.Sprintf("%s/cache?keys=%s&version=%s", base, key, version))
|
clientRead := &http.Client{Transport: &bearerTransport{token: "token-a-read"}}
|
||||||
require.NoError(t, err)
|
for _, client := range []*http.Client{clientA, clientRead} {
|
||||||
resp.Body.Close()
|
resp, err = client.Get(fmt.Sprintf("%s/cache?keys=%s&version=%s", base, key, version))
|
||||||
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
require.NoError(t, err)
|
||||||
|
resp.Body.Close()
|
||||||
|
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
for _, client := range []*http.Client{clientB, {Transport: &bearerTransport{token: "token-a-pull"}}} {
|
requireDenied := func(prefix string, do func() (*http.Response, error)) {
|
||||||
|
resp, err := do()
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer resp.Body.Close()
|
||||||
|
denied := map[string]string{}
|
||||||
|
require.NoError(t, json.UnmarshalRead(resp.Body, &denied))
|
||||||
|
assert.Equal(t, http.StatusForbidden, resp.StatusCode)
|
||||||
|
assert.True(t, strings.HasPrefix(denied["message"], prefix), denied["message"])
|
||||||
|
}
|
||||||
|
requireDenied("cache write denied:", func() (*http.Response, error) {
|
||||||
|
return clientRead.Post(base+"/caches", "application/json", strings.NewReader(`{"key":"new-key","version":"`+version+`"}`))
|
||||||
|
})
|
||||||
|
requireDenied("cache read denied:", func() (*http.Response, error) {
|
||||||
|
return (&http.Client{Transport: &bearerTransport{token: "token-a-write-only"}}).Get(fmt.Sprintf("%s/cache?keys=%s&version=%s", base, key, version))
|
||||||
|
})
|
||||||
|
|
||||||
|
for _, client := range []*http.Client{clientB, {Transport: &bearerTransport{token: "token-a-pull"}}, clientRead} {
|
||||||
req, err = http.NewRequest(http.MethodPatch, fmt.Sprintf("%s/caches/%d", base, id), bytes.NewReader([]byte("poison")))
|
req, err = http.NewRequest(http.MethodPatch, fmt.Sprintf("%s/caches/%d", base, id), bytes.NewReader([]byte("poison")))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
req.Header.Set("Content-Range", "bytes 0-5/*")
|
req.Header.Set("Content-Range", "bytes 0-5/*")
|
||||||
|
|||||||
@@ -40,12 +40,13 @@ const (
|
|||||||
twirpInternal = "internal"
|
twirpInternal = "internal"
|
||||||
twirpUnavailable = "unavailable"
|
twirpUnavailable = "unavailable"
|
||||||
twirpUnauthenticated = "unauthenticated"
|
twirpUnauthenticated = "unauthenticated"
|
||||||
|
twirpDenied = "permission_denied"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (h *Handler) registerV2Routes(router *http.ServeMux) {
|
func (h *Handler) registerV2Routes(router *http.ServeMux) {
|
||||||
router.HandleFunc("POST "+cacheServiceV2Path+"/CreateCacheEntry", h.bearerAuth(h.v2CreateCacheEntry))
|
router.HandleFunc("POST "+cacheServiceV2Path+"/CreateCacheEntry", h.cacheModeAuth(true, h.v2CreateCacheEntry))
|
||||||
router.HandleFunc("POST "+cacheServiceV2Path+"/FinalizeCacheEntryUpload", h.bearerAuth(h.v2FinalizeCacheEntryUpload))
|
router.HandleFunc("POST "+cacheServiceV2Path+"/FinalizeCacheEntryUpload", h.cacheModeAuth(true, h.v2FinalizeCacheEntryUpload))
|
||||||
router.HandleFunc("POST "+cacheServiceV2Path+"/GetCacheEntryDownloadURL", h.bearerAuth(h.v2GetCacheEntryDownloadURL))
|
router.HandleFunc("POST "+cacheServiceV2Path+"/GetCacheEntryDownloadURL", h.cacheModeAuth(false, h.v2GetCacheEntryDownloadURL))
|
||||||
router.HandleFunc("PUT "+blobPath+"/{id}", h.signedAuth(blobUploadPurpose, h.v2UploadBlob))
|
router.HandleFunc("PUT "+blobPath+"/{id}", h.signedAuth(blobUploadPurpose, h.v2UploadBlob))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -267,6 +268,8 @@ func (h *Handler) twirpError(w http.ResponseWriter, r *http.Request, code string
|
|||||||
status = http.StatusServiceUnavailable
|
status = http.StatusServiceUnavailable
|
||||||
case twirpUnauthenticated:
|
case twirpUnauthenticated:
|
||||||
status = http.StatusUnauthorized
|
status = http.StatusUnauthorized
|
||||||
|
case twirpDenied:
|
||||||
|
status = http.StatusForbidden
|
||||||
}
|
}
|
||||||
h.responseJSON(w, r, status, map[string]any{"code": code, "msg": err.Error()})
|
h.responseJSON(w, r, status, map[string]any{"code": code, "msg": err.Error()})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,6 +227,30 @@ func TestCacheServiceV2Lookups(t *testing.T) {
|
|||||||
assert.NotEmpty(t, got["archiveLocation"])
|
assert.NotEmpty(t, got["archiveLocation"])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("a read-only job only restores and a write-only one only saves", func(t *testing.T) {
|
||||||
|
handler.RegisterJob("read-only", JobCredential{Repo: testRepo, CacheMode: "read"})
|
||||||
|
readOnlyClient := &http.Client{Transport: &bearerTransport{token: "read-only"}}
|
||||||
|
|
||||||
|
assert.Equal(t, true, v2Call(t, handler, readOnlyClient, "GetCacheEntryDownloadURL", map[string]any{"key": "deps-abc", "version": "v1"})["ok"])
|
||||||
|
for _, method := range []string{"CreateCacheEntry", "FinalizeCacheEntryUpload"} {
|
||||||
|
got := v2Call(t, handler, readOnlyClient, method, map[string]any{"key": "deps-new", "version": "v1", "size_bytes": 1})
|
||||||
|
assert.Equal(t, false, got["ok"], method)
|
||||||
|
assert.True(t, strings.HasPrefix(got["message"].(string), "cache write denied:"), method)
|
||||||
|
}
|
||||||
|
|
||||||
|
handler.RegisterJob("write-only", JobCredential{Repo: testRepo, CacheMode: "write-only"})
|
||||||
|
writeOnlyClient := &http.Client{Transport: &bearerTransport{token: "write-only"}}
|
||||||
|
assert.Equal(t, true, v2Call(t, handler, writeOnlyClient, "CreateCacheEntry", map[string]any{"key": "deps-write-only", "version": "v1"})["ok"])
|
||||||
|
resp, err := writeOnlyClient.Post(handler.ExternalURL()+cacheServiceV2Path+"/GetCacheEntryDownloadURL", "application/json", strings.NewReader(`{"key":"deps-abc","version":"v1"}`))
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer resp.Body.Close()
|
||||||
|
got := map[string]string{}
|
||||||
|
require.NoError(t, json.UnmarshalRead(resp.Body, &got))
|
||||||
|
assert.Equal(t, http.StatusForbidden, resp.StatusCode)
|
||||||
|
assert.Equal(t, twirpDenied, got["code"])
|
||||||
|
assert.True(t, strings.HasPrefix(got["msg"], "cache read denied:"), got["msg"])
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("another repository sees nothing", func(t *testing.T) {
|
t.Run("another repository sees nothing", func(t *testing.T) {
|
||||||
handler.RegisterJob("other-runtime-token", JobCredential{Repo: "other/repo"})
|
handler.RegisterJob("other-runtime-token", JobCredential{Repo: "other/repo"})
|
||||||
otherClient := &http.Client{Transport: &bearerTransport{token: "other-runtime-token"}}
|
otherClient := &http.Client{Transport: &bearerTransport{token: "other-runtime-token"}}
|
||||||
|
|||||||
@@ -152,6 +152,8 @@ type NewDockerBuildExecutorInput struct {
|
|||||||
ContextDir string
|
ContextDir string
|
||||||
Dockerfile string
|
Dockerfile string
|
||||||
BuildContext io.Reader
|
BuildContext io.Reader
|
||||||
|
Dockerignore []byte // applied to BuildContext as the docker CLI applies it
|
||||||
|
Stdout io.Writer
|
||||||
ImageTag string
|
ImageTag string
|
||||||
Platform string
|
Platform string
|
||||||
BuildArgs map[string]*string
|
BuildArgs map[string]*string
|
||||||
|
|||||||
@@ -8,10 +8,13 @@ package container
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"archive/tar"
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -63,7 +66,7 @@ func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor {
|
|||||||
}
|
}
|
||||||
var buildContext io.ReadCloser
|
var buildContext io.ReadCloser
|
||||||
if input.BuildContext != nil {
|
if input.BuildContext != nil {
|
||||||
buildContext = io.NopCloser(input.BuildContext)
|
buildContext, err = filterBuildContext(input.BuildContext, input.Dockerignore, input.Dockerfile)
|
||||||
} else {
|
} else {
|
||||||
buildContext, err = createBuildContext(ctx, input.ContextDir, input.Dockerfile)
|
buildContext, err = createBuildContext(ctx, input.ContextDir, input.Dockerfile)
|
||||||
}
|
}
|
||||||
@@ -78,10 +81,97 @@ func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return logDockerResponse(logger, resp.Body, false)
|
err = logDockerResponse(logger, resp.Body, func(format string, args ...any) { fmt.Fprintf(input.Stdout, format, args...) })
|
||||||
|
common.FlushWriter(input.Stdout)
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func filterBuildContext(buildContext io.Reader, dockerignore []byte, relDockerfile string) (io.ReadCloser, error) {
|
||||||
|
excludes, err := ignorefile.ReadAll(bytes.NewReader(dockerignore))
|
||||||
|
if err != nil || len(excludes) == 0 {
|
||||||
|
return io.NopCloser(buildContext), err
|
||||||
|
}
|
||||||
|
pm, err := patternmatcher.New(excludes)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
reader, writer := io.Pipe()
|
||||||
|
go func() {
|
||||||
|
writer.CloseWithError(writeFilteredBuildContext(writer, buildContext, pm, path.Clean(filepath.ToSlash(relDockerfile))))
|
||||||
|
}()
|
||||||
|
return reader, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeFilteredBuildContext(w io.Writer, buildContext io.Reader, pm *patternmatcher.PatternMatcher, relDockerfile string) error {
|
||||||
|
spool, err := os.CreateTemp("", "gitea-runner-build-") // excluded content, for a kept hardlink to it
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer os.Remove(spool.Name())
|
||||||
|
defer spool.Close()
|
||||||
|
|
||||||
|
reader := tar.NewReader(buildContext)
|
||||||
|
writer := tar.NewWriter(w)
|
||||||
|
buffer := make([]byte, 32*1024)
|
||||||
|
excluded := map[string]*excludedBuildContextEntry{}
|
||||||
|
for {
|
||||||
|
header, err := reader.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
return writer.Close()
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
name := path.Clean(header.Name)
|
||||||
|
var target *excludedBuildContextEntry
|
||||||
|
if header.Typeflag == tar.TypeLink {
|
||||||
|
target = excluded[path.Clean(header.Linkname)]
|
||||||
|
}
|
||||||
|
if name != ".dockerignore" && name != relDockerfile {
|
||||||
|
skip, err := pm.MatchesOrParentMatches(name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if skip {
|
||||||
|
if target != nil {
|
||||||
|
excluded[name] = target
|
||||||
|
} else if header.Typeflag != tar.TypeDir {
|
||||||
|
offset, err := spool.Seek(0, io.SeekCurrent)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
excluded[name] = &excludedBuildContextEntry{header: header, offset: offset}
|
||||||
|
if _, err := io.CopyBuffer(spool, reader, buffer); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var content io.Reader = reader
|
||||||
|
if target != nil && target.keptName != "" {
|
||||||
|
header.Linkname = target.keptName
|
||||||
|
} else if target != nil {
|
||||||
|
header.Typeflag, header.Linkname, header.Size = target.header.Typeflag, target.header.Linkname, target.header.Size
|
||||||
|
content = io.NewSectionReader(spool, target.offset, header.Size)
|
||||||
|
target.keptName = header.Name
|
||||||
|
}
|
||||||
|
if err := writer.WriteHeader(header); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err := io.CopyBuffer(writer, content, buffer); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type excludedBuildContextEntry struct {
|
||||||
|
header *tar.Header
|
||||||
|
offset int64
|
||||||
|
keptName string
|
||||||
|
}
|
||||||
|
|
||||||
func createBuildContext(ctx context.Context, contextDir, relDockerfile string) (io.ReadCloser, error) {
|
func createBuildContext(ctx context.Context, contextDir, relDockerfile string) (io.ReadCloser, error) {
|
||||||
common.Logger(ctx).Debugf("Creating archive for build context dir '%s' with relative dockerfile '%s'", contextDir, relDockerfile)
|
common.Logger(ctx).Debugf("Creating archive for build context dir '%s' with relative dockerfile '%s'", contextDir, relDockerfile)
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ package container
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"archive/tar"
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
@@ -35,7 +37,7 @@ func TestDockerBuildLabelsImageWithItsTagAndReportsDaemonError(t *testing.T) {
|
|||||||
t.Setenv("DOCKER_AUTH_CONFIG", "")
|
t.Setenv("DOCKER_AUTH_CONFIG", "")
|
||||||
|
|
||||||
require.ErrorContains(t, NewDockerBuildExecutor(NewDockerBuildExecutorInput{
|
require.ErrorContains(t, NewDockerBuildExecutor(NewDockerBuildExecutorInput{
|
||||||
ImageTag: "action:test", Dockerfile: "Dockerfile", BuildContext: strings.NewReader(""),
|
ImageTag: "action:test", Dockerfile: "Dockerfile", BuildContext: strings.NewReader(""), Stdout: io.Discard,
|
||||||
})(t.Context()), "build rejected")
|
})(t.Context()), "build rejected")
|
||||||
require.JSONEq(t, `{"com.gitea.runner.image":"action:test"}`, labels)
|
require.JSONEq(t, `{"com.gitea.runner.image":"action:test"}`, labels)
|
||||||
}
|
}
|
||||||
@@ -72,3 +74,56 @@ func TestCreateBuildContextFollowsDockerignoreAndSymlinkedRootButKeepsDockerfile
|
|||||||
require.Equal(t, []string{".dockerignore", "a.txt", "build/keep.txt", "empty/", "Dockerfile"}, names, contextDir)
|
require.Equal(t, []string{".dockerignore", "a.txt", "build/keep.txt", "empty/", "Dockerfile"}, names, contextDir)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFilterBuildContextAppliesDockerignoreAndMaterializesHardlinksToExcludedFiles(t *testing.T) {
|
||||||
|
const dockerignore = "*.log\nbuild\n!build/keep.txt\nActionfile\n.dockerignore\n"
|
||||||
|
for _, prefix := range []string{"", "./"} {
|
||||||
|
var archive bytes.Buffer
|
||||||
|
writer := tar.NewWriter(&archive)
|
||||||
|
for _, entry := range []struct {
|
||||||
|
name, body, link string
|
||||||
|
typeflag byte
|
||||||
|
}{
|
||||||
|
{"Actionfile", "FROM scratch", "", tar.TypeReg},
|
||||||
|
{"output.log", "log", "", tar.TypeReg},
|
||||||
|
{"build/", "", "", tar.TypeDir},
|
||||||
|
{"build/drop.txt", "drop", "", tar.TypeReg},
|
||||||
|
{"build/keep.txt", "keep", "", tar.TypeReg},
|
||||||
|
{"entrypoint", "", prefix + "output.log", tar.TypeLink},
|
||||||
|
{"other-entrypoint", "", prefix + "output.log", tar.TypeLink},
|
||||||
|
{".dockerignore", dockerignore, "", tar.TypeReg},
|
||||||
|
} {
|
||||||
|
require.NoError(t, writer.WriteHeader(&tar.Header{Name: prefix + entry.name, Linkname: entry.link, Typeflag: entry.typeflag, Size: int64(len(entry.body)), Mode: 0o644}))
|
||||||
|
_, err := io.WriteString(writer, entry.body)
|
||||||
|
require.NoError(t, err)
|
||||||
|
}
|
||||||
|
require.NoError(t, writer.Close())
|
||||||
|
|
||||||
|
unfiltered, err := filterBuildContext(bytes.NewReader(archive.Bytes()), nil, "Actionfile")
|
||||||
|
require.NoError(t, err)
|
||||||
|
passedThrough, err := io.ReadAll(unfiltered)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, archive.Bytes(), passedThrough)
|
||||||
|
|
||||||
|
filtered, err := filterBuildContext(bytes.NewReader(archive.Bytes()), []byte(dockerignore), "Actionfile")
|
||||||
|
require.NoError(t, err)
|
||||||
|
var entries []string
|
||||||
|
for reader := tar.NewReader(filtered); ; {
|
||||||
|
header, err := reader.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
require.NoError(t, err)
|
||||||
|
body, err := io.ReadAll(reader)
|
||||||
|
require.NoError(t, err)
|
||||||
|
entries = append(entries, fmt.Sprintf("%s %c %s %s", strings.TrimPrefix(header.Name, prefix), header.Typeflag, strings.TrimPrefix(header.Linkname, prefix), body))
|
||||||
|
}
|
||||||
|
require.Equal(t, []string{
|
||||||
|
"Actionfile 0 FROM scratch",
|
||||||
|
"build/keep.txt 0 keep",
|
||||||
|
"entrypoint 0 log",
|
||||||
|
"other-entrypoint 1 entrypoint ",
|
||||||
|
".dockerignore 0 " + dockerignore,
|
||||||
|
}, entries, prefix)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,8 @@
|
|||||||
// Copyright 2022 The nektos/act Authors. All rights reserved.
|
// Copyright 2022 The nektos/act Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
// This file is based on https://github.com/docker/cli/blob/4a63305d74332de5ceba7fcbccbc3cbb7412f5ba/cli/command/container/opts_test.go with:
|
// This file is based on https://github.com/docker/cli/blob/4a63305d74332de5ceba7fcbccbc3cbb7412f5ba/cli/command/container/opts_test.go with:
|
||||||
// * appended with license information
|
// * appended with license information
|
||||||
// * added tests for the locally changed parseDevice, validateDevice and invalidParameter
|
// * added tests for the locally changed parseDevice, validateDevice and invalidParameter
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -38,7 +40,7 @@ func loadScratchImage(t *testing.T, platform string) string {
|
|||||||
response, err := cli.ImageLoad(t.Context(), &archive)
|
response, err := cli.ImageLoad(t.Context(), &archive)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer response.Close()
|
defer response.Close()
|
||||||
require.NoError(t, logDockerResponse(common.Logger(t.Context()), response, false))
|
require.NoError(t, logDockerResponse(common.Logger(t.Context()), response, common.Logger(t.Context()).Debugf))
|
||||||
t.Cleanup(func() {
|
t.Cleanup(func() {
|
||||||
_, _ = cli.ImageRemove(context.WithoutCancel(t.Context()), tag, mobyclient.ImageRemoveOptions{Force: true})
|
_, _ = cli.ImageRemove(context.WithoutCancel(t.Context()), tag, mobyclient.ImageRemoveOptions{Force: true})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ package container
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"cmp"
|
||||||
"encoding/json/v2"
|
"encoding/json/v2"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
@@ -26,10 +27,7 @@ type dockerMessage struct {
|
|||||||
Progress string `json:"progress"`
|
Progress string `json:"progress"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func logDockerResponse(logger *logging.Logger, dockerResponse io.ReadCloser, isError bool) error {
|
func logDockerResponse(logger *logging.Logger, dockerResponse io.ReadCloser, log func(string, ...any)) error {
|
||||||
if dockerResponse == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
defer dockerResponse.Close()
|
defer dockerResponse.Close()
|
||||||
|
|
||||||
scanner := bufio.NewScanner(dockerResponse)
|
scanner := bufio.NewScanner(dockerResponse)
|
||||||
@@ -38,41 +36,28 @@ func logDockerResponse(logger *logging.Logger, dockerResponse io.ReadCloser, isE
|
|||||||
line := scanner.Bytes()
|
line := scanner.Bytes()
|
||||||
var msg dockerMessage
|
var msg dockerMessage
|
||||||
if err := json.Unmarshal(line, &msg); err != nil {
|
if err := json.Unmarshal(line, &msg); err != nil {
|
||||||
writeLog(logger, false, "Unable to unmarshal line [%s] ==> %v", string(line), err)
|
logger.Debugf("Unable to unmarshal line [%s] ==> %v", string(line), err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if msg.Error != "" {
|
if message := cmp.Or(msg.Error, msg.ErrorDetail.Message); message != "" {
|
||||||
writeLog(logger, isError, "%s", msg.Error)
|
log("%s", message)
|
||||||
return errors.New(msg.Error)
|
return errors.New(message)
|
||||||
}
|
|
||||||
|
|
||||||
if msg.ErrorDetail.Message != "" {
|
|
||||||
writeLog(logger, isError, "%s", msg.ErrorDetail.Message)
|
|
||||||
return errors.New(msg.ErrorDetail.Message)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case msg.Status != "":
|
case msg.Status != "":
|
||||||
if msg.Progress != "" {
|
if msg.Progress != "" {
|
||||||
writeLog(logger, isError, "%s :: %s :: %s\n", msg.Status, msg.ID, msg.Progress)
|
log("%s :: %s :: %s\n", msg.Status, msg.ID, msg.Progress)
|
||||||
} else {
|
} else {
|
||||||
writeLog(logger, isError, "%s :: %s\n", msg.Status, msg.ID)
|
log("%s :: %s\n", msg.Status, msg.ID)
|
||||||
}
|
}
|
||||||
case msg.Stream != "":
|
case msg.Stream != "":
|
||||||
writeLog(logger, isError, "%s", msg.Stream)
|
log("%s", msg.Stream)
|
||||||
default:
|
default:
|
||||||
writeLog(logger, false, "Unable to handle line: %s", string(line))
|
logger.Debugf("Unable to handle line: %s", string(line))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return scanner.Err()
|
return scanner.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeLog(logger *logging.Logger, isError bool, format string, args ...any) {
|
|
||||||
if isError {
|
|
||||||
logger.Errorf(format, args...)
|
|
||||||
} else {
|
|
||||||
logger.Debugf(format, args...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -61,11 +61,10 @@ func NewDockerPullExecutor(input NewDockerPullExecutorInput) common.Executor {
|
|||||||
// stream rather than on the call itself, so both have to be checked
|
// stream rather than on the call itself, so both have to be checked
|
||||||
pullOnce := func(opts client.ImagePullOptions) error {
|
pullOnce := func(opts client.ImagePullOptions) error {
|
||||||
reader, err := cli.ImagePull(ctx, imageRef, opts)
|
reader, err := cli.ImagePull(ctx, imageRef, opts)
|
||||||
streamErr := logDockerResponse(logger, reader, err != nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return streamErr
|
return logDockerResponse(logger, reader, logger.Debugf)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pullOnce(imagePullOptions)
|
err = pullOnce(imagePullOptions)
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -95,15 +97,16 @@ func TestIsPinnedImage(t *testing.T) {
|
|||||||
// The pull path reports a failure the daemon sent mid-stream, so it must carry the reason
|
// The pull path reports a failure the daemon sent mid-stream, so it must carry the reason
|
||||||
// whichever of the two shapes the daemon used.
|
// whichever of the two shapes the daemon used.
|
||||||
func TestLogDockerResponseError(t *testing.T) {
|
func TestLogDockerResponseError(t *testing.T) {
|
||||||
logger := logging.New(logtest.New())
|
logger, hook := logtest.NewLogger()
|
||||||
streamErr := func(line string) error {
|
streamErr := func(line string) error {
|
||||||
return logDockerResponse(logger, io.NopCloser(strings.NewReader(line)), false)
|
return logDockerResponse(logger, io.NopCloser(strings.NewReader(line)), logger.Infof)
|
||||||
}
|
}
|
||||||
require.EqualError(t, streamErr(`{"error":"toomanyrequests: rate limit exceeded"}`), "toomanyrequests: rate limit exceeded")
|
require.EqualError(t, streamErr(`{"error":"toomanyrequests: rate limit exceeded"}`), "toomanyrequests: rate limit exceeded")
|
||||||
require.EqualError(t, streamErr(`{"errorDetail":{"message":"unexpected EOF"}}`), "unexpected EOF")
|
require.EqualError(t, streamErr(`{"errorDetail":{"message":"unexpected EOF"}}`), "unexpected EOF")
|
||||||
require.NoError(t, streamErr(`{"status":"Downloading"}`))
|
require.NoError(t, streamErr(`{"status":"Downloading"}`))
|
||||||
require.NoError(t, streamErr(`{"stream":"`+strings.Repeat("x", 70000)+`"}`))
|
require.NoError(t, streamErr(`{"stream":"`+strings.Repeat("x", 70000)+`"}`))
|
||||||
|
assert.Equal(t, logging.LevelInfo, hook.LastRecord().Level)
|
||||||
require.ErrorIs(t, logDockerResponse(logger, io.NopCloser(io.MultiReader(
|
require.ErrorIs(t, logDockerResponse(logger, io.NopCloser(io.MultiReader(
|
||||||
strings.NewReader(`{"status":"Downloading"}`+"\n"), iotest.ErrReader(io.ErrUnexpectedEOF),
|
strings.NewReader(`{"status":"Downloading"}`+"\n"), iotest.ErrReader(io.ErrUnexpectedEOF),
|
||||||
)), false), io.ErrUnexpectedEOF)
|
)), logger.Infof), io.ErrUnexpectedEOF)
|
||||||
}
|
}
|
||||||
+20
-11
@@ -23,6 +23,7 @@ import (
|
|||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gitea.com/gitea/runner/act/common"
|
"gitea.com/gitea/runner/act/common"
|
||||||
@@ -83,8 +84,13 @@ func (cr *containerReference) Start(attach bool) common.Executor {
|
|||||||
cr.attach().IfBool(attach),
|
cr.attach().IfBool(attach),
|
||||||
cr.start(),
|
cr.start(),
|
||||||
cr.wait().IfBool(attach),
|
cr.wait().IfBool(attach),
|
||||||
cr.tryReadID("-u", func(id int) { cr.UID = id }),
|
func(ctx context.Context) error {
|
||||||
cr.tryReadID("-g", func(id int) { cr.GID = id }),
|
var wg sync.WaitGroup
|
||||||
|
wg.Go(func() { _ = cr.tryReadID("-u", func(id int) { cr.UID = id })(ctx) })
|
||||||
|
_ = cr.tryReadID("-g", func(id int) { cr.GID = id })(ctx)
|
||||||
|
wg.Wait()
|
||||||
|
return nil
|
||||||
|
},
|
||||||
func(ctx context.Context) error {
|
func(ctx context.Context) error {
|
||||||
// If this fails, then folders have wrong permissions on non root container
|
// If this fails, then folders have wrong permissions on non root container
|
||||||
if cr.UID != 0 || cr.GID != 0 {
|
if cr.UID != 0 || cr.GID != 0 {
|
||||||
@@ -184,6 +190,9 @@ func (cr *containerReference) Inspect(ctx context.Context) (*Info, error) {
|
|||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if cr.containerEnvID != cr.id && result.Container.Config != nil {
|
||||||
|
cr.containerEnv, cr.containerEnvID = opts.ConvertKVStringsToMap(result.Container.Config.Env), cr.id
|
||||||
|
}
|
||||||
return containerInfoFromInspect(result.Container), nil
|
return containerInfoFromInspect(result.Container), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,15 +316,13 @@ func (cr *containerReference) UpdateFromEnv(srcPath string, env *map[string]stri
|
|||||||
func (cr *containerReference) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
func (cr *containerReference) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
||||||
envMap := *env
|
envMap := *env
|
||||||
return common.Executor(func(ctx context.Context) error {
|
return common.Executor(func(ctx context.Context) error {
|
||||||
inspect, err := cr.cli.ContainerInspect(ctx, cr.id, client.ContainerInspectOptions{})
|
if cr.containerEnvID != cr.id {
|
||||||
if err != nil {
|
if _, err := cr.Inspect(ctx); err != nil {
|
||||||
common.Logger(ctx).Error(err)
|
common.Logger(ctx).Error(err)
|
||||||
return fmt.Errorf("inspect container: %w", err)
|
return fmt.Errorf("inspect container: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if inspect.Container.Config == nil {
|
for key, value := range cr.containerEnv {
|
||||||
return nil
|
|
||||||
}
|
|
||||||
for key, value := range opts.ConvertKVStringsToMap(inspect.Container.Config.Env) {
|
|
||||||
if envMap[key] == "" {
|
if envMap[key] == "" {
|
||||||
envMap[key] = value
|
envMap[key] = value
|
||||||
} else if key == "PATH" {
|
} else if key == "PATH" {
|
||||||
@@ -365,7 +372,9 @@ type containerReference struct {
|
|||||||
// attachDone is closed by the attach() streaming goroutine once it has
|
// attachDone is closed by the attach() streaming goroutine once it has
|
||||||
// drained and flushed the container's output. wait() blocks on it so the
|
// drained and flushed the container's output. wait() blocks on it so the
|
||||||
// tail of the log lands before the step proceeds.
|
// tail of the log lands before the step proceeds.
|
||||||
attachDone chan struct{}
|
attachDone chan struct{}
|
||||||
|
containerEnv map[string]string // fixed at creation, cached by inspect for containerEnvID
|
||||||
|
containerEnvID string
|
||||||
LinuxContainerEnvironmentExtensions
|
LinuxContainerEnvironmentExtensions
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -45,14 +47,15 @@ func TestDockerEnvironmentUsesContainerPath(t *testing.T) {
|
|||||||
Return(mobyclient.ContainerInspectResult{Container: container.InspectResponse{Config: &container.Config{Env: []string{
|
Return(mobyclient.ContainerInspectResult{Container: container.InspectResponse{Config: &container.Config{Env: []string{
|
||||||
"PATH=/opt/node/x64/bin:/usr/bin:/bin", "CONFLICT_VAR=container-value", "SOME_RANDOM_VAR=",
|
"PATH=/opt/node/x64/bin:/usr/bin:/bin", "CONFLICT_VAR=container-value", "SOME_RANDOM_VAR=",
|
||||||
"ANOTHER_ONE=old-value", "ANOTHER_ONE=BUT_I_HAVE_VALUE", "LITERAL='quoted'=$HOME\nsecond line",
|
"ANOTHER_ONE=old-value", "ANOTHER_ONE=BUT_I_HAVE_VALUE", "LITERAL='quoted'=$HOME\nsecond line",
|
||||||
}}}}, nil)
|
}}}}, nil).Once()
|
||||||
env := map[string]string{
|
env := map[string]string{
|
||||||
"PATH": "/custom/bin",
|
"PATH": "/custom/bin",
|
||||||
"RANDOM_VAR": "WITH_VALUE",
|
"RANDOM_VAR": "WITH_VALUE",
|
||||||
"ANOTHER_VAR": "",
|
"ANOTHER_VAR": "",
|
||||||
"CONFLICT_VAR": "step-value",
|
"CONFLICT_VAR": "step-value",
|
||||||
}
|
}
|
||||||
require.NoError(t, (&containerReference{cli: client, id: "amd64-job"}).UpdateFromImageEnv(&env)(t.Context()))
|
cr := &containerReference{cli: client, id: "amd64-job"}
|
||||||
|
require.NoError(t, cr.UpdateFromImageEnv(&env)(t.Context()))
|
||||||
assert.Equal(t, map[string]string{
|
assert.Equal(t, map[string]string{
|
||||||
"PATH": "/custom/bin:/opt/node/x64/bin:/usr/bin:/bin",
|
"PATH": "/custom/bin:/opt/node/x64/bin:/usr/bin:/bin",
|
||||||
"RANDOM_VAR": "WITH_VALUE",
|
"RANDOM_VAR": "WITH_VALUE",
|
||||||
@@ -62,6 +65,10 @@ func TestDockerEnvironmentUsesContainerPath(t *testing.T) {
|
|||||||
"CONFLICT_VAR": "step-value",
|
"CONFLICT_VAR": "step-value",
|
||||||
"LITERAL": "'quoted'=$HOME\nsecond line",
|
"LITERAL": "'quoted'=$HOME\nsecond line",
|
||||||
}, env)
|
}, env)
|
||||||
|
pathEnv := map[string]string{}
|
||||||
|
require.NoError(t, cr.UpdateFromImageEnv(&pathEnv)(t.Context()))
|
||||||
|
assert.Equal(t, "/opt/node/x64/bin:/usr/bin:/bin", pathEnv["PATH"])
|
||||||
|
client.AssertExpectations(t)
|
||||||
}
|
}
|
||||||
|
|
||||||
type mockDockerClient struct {
|
type mockDockerClient struct {
|
||||||
|
|||||||
@@ -16,8 +16,13 @@ import (
|
|||||||
"gitea.com/gitea/runner/act/common"
|
"gitea.com/gitea/runner/act/common"
|
||||||
|
|
||||||
"github.com/moby/moby/api/types/system"
|
"github.com/moby/moby/api/types/system"
|
||||||
|
"github.com/moby/moby/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func GetDockerClient(context.Context) (client.APIClient, error) {
|
||||||
|
return nil, errors.ErrUnsupported
|
||||||
|
}
|
||||||
|
|
||||||
func IsolatedCacheContainer(context.Context, netip.Addr, string) (string, error) {
|
func IsolatedCacheContainer(context.Context, netip.Addr, string) (string, error) {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
@@ -25,13 +30,13 @@ func IsolatedCacheContainer(context.Context, netip.Addr, string) (string, error)
|
|||||||
// ImageExistsLocally returns a boolean indicating if an image with the
|
// ImageExistsLocally returns a boolean indicating if an image with the
|
||||||
// requested name, tag and architecture exists in the local docker image store
|
// requested name, tag and architecture exists in the local docker image store
|
||||||
func ImageExistsLocally(ctx context.Context, imageName, platform string) (bool, error) {
|
func ImageExistsLocally(ctx context.Context, imageName, platform string) (bool, error) {
|
||||||
return false, errors.New("Unsupported Operation")
|
return false, errors.ErrUnsupported
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveImage removes image from local store, the function is used to run different
|
// RemoveImage removes image from local store, the function is used to run different
|
||||||
// container image architectures
|
// container image architectures
|
||||||
func RemoveImage(ctx context.Context, imageName string, force, pruneChildren bool) (bool, error) {
|
func RemoveImage(ctx context.Context, imageName string, force, pruneChildren bool) (bool, error) {
|
||||||
return false, errors.New("Unsupported Operation")
|
return false, errors.ErrUnsupported
|
||||||
}
|
}
|
||||||
|
|
||||||
func RemoveDockerJobResources(_ context.Context, _ string) error {
|
func RemoveDockerJobResources(_ context.Context, _ string) error {
|
||||||
@@ -43,20 +48,20 @@ func NewDockerProxy(_ context.Context, _ string) *DockerProxy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func StartDockerProxy(daemonSocket, dir, job string) (*DockerProxy, error) {
|
func StartDockerProxy(daemonSocket, dir, job string) (*DockerProxy, error) {
|
||||||
return nil, errors.New("Unsupported Operation")
|
return nil, errors.ErrUnsupported
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewDockerBuildExecutor function to create a run executor for the container
|
// NewDockerBuildExecutor function to create a run executor for the container
|
||||||
func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor {
|
func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor {
|
||||||
return func(ctx context.Context) error {
|
return func(ctx context.Context) error {
|
||||||
return errors.New("Unsupported Operation")
|
return errors.ErrUnsupported
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewDockerPullExecutor function to create a run executor for the container
|
// NewDockerPullExecutor function to create a run executor for the container
|
||||||
func NewDockerPullExecutor(input NewDockerPullExecutorInput) common.Executor {
|
func NewDockerPullExecutor(input NewDockerPullExecutorInput) common.Executor {
|
||||||
return func(ctx context.Context) error {
|
return func(ctx context.Context) error {
|
||||||
return errors.New("Unsupported Operation")
|
return errors.ErrUnsupported
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd || freebsd))
|
||||||
|
|
||||||
package container
|
package container
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -31,18 +31,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type HostEnvironment struct {
|
type HostEnvironment struct {
|
||||||
Path string
|
Path string
|
||||||
TmpDir string
|
TmpDir string
|
||||||
ToolCache string
|
ToolCache string
|
||||||
Workdir string
|
Workdir string
|
||||||
// CleanWorkdir means teardown owns Workdir and may delete it. Leave false
|
ActPath string
|
||||||
// when Workdir points at a caller-owned checkout (e.g. `act` local mode).
|
Root string
|
||||||
CleanWorkdir bool
|
TrackingID string // RUNNER_TRACKING_ID of the job, a step with another value keeps its leftovers
|
||||||
ActPath string
|
StdOut io.Writer
|
||||||
Root string
|
AllocatePTY bool // allocate a pseudo-TTY for each step's process
|
||||||
TrackingID string // RUNNER_TRACKING_ID of the job, a step with another value keeps its leftovers
|
|
||||||
StdOut io.Writer
|
|
||||||
AllocatePTY bool // allocate a pseudo-TTY for each step's process
|
|
||||||
|
|
||||||
// procGroup owns every process the job's steps start. Atomic: Remove may read
|
// procGroup owns every process the job's steps start. Atomic: Remove may read
|
||||||
// it while a step is still starting.
|
// it while a step is still starting.
|
||||||
@@ -283,6 +280,7 @@ func (e *HostEnvironment) exec(ctx context.Context, command []string, cmdline st
|
|||||||
// wait, so an orphan holding cmd's stdout pipe cannot hang cmd.Wait().
|
// wait, so an orphan holding cmd's stdout pipe cannot hang cmd.Wait().
|
||||||
treeKill := process.NewTreeKill(cmd)
|
treeKill := process.NewTreeKill(cmd)
|
||||||
treeKill.KeepLeftovers = !tracked
|
treeKill.KeepLeftovers = !tracked
|
||||||
|
treeKill.GracefulCancel = true
|
||||||
|
|
||||||
var ppty *os.File
|
var ppty *os.File
|
||||||
var tty *os.File
|
var tty *os.File
|
||||||
@@ -435,24 +433,14 @@ func (e *HostEnvironment) Remove() common.Executor {
|
|||||||
rmCtx, rmCancel := context.WithTimeout(context.Background(), hostCleanupTimeout)
|
rmCtx, rmCancel := context.WithTimeout(context.Background(), hostCleanupTimeout)
|
||||||
defer rmCancel()
|
defer rmCancel()
|
||||||
|
|
||||||
var errs []error
|
err := removePathWithRetry(rmCtx, cmp.Or(e.Root, e.Path))
|
||||||
if err := removePathWithRetry(rmCtx, cmp.Or(e.Root, e.Path)); err != nil {
|
if err != nil {
|
||||||
logger.Warnf("failed to remove host misc state %s: %v", cmp.Or(e.Root, e.Path), err)
|
logger.Warnf("failed to remove host misc state %s: %v", cmp.Or(e.Root, e.Path), err)
|
||||||
errs = append(errs, err)
|
|
||||||
}
|
}
|
||||||
if e.CleanWorkdir {
|
if errors.Is(err, context.DeadlineExceeded) {
|
||||||
if err := removePathWithRetry(rmCtx, e.Workdir); err != nil {
|
return nil // a stalled delete must not fail job completion
|
||||||
logger.Warnf("failed to remove host workspace %s: %v", e.Workdir, err)
|
|
||||||
errs = append(errs, err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for _, err := range errs {
|
return err
|
||||||
if !errors.Is(err, context.DeadlineExceeded) {
|
|
||||||
return errors.Join(errs...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Teardown timed out; warned above. Do not fail job completion over it.
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -158,27 +158,12 @@ func TestHostEnvironmentAllocatePTY(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestHostEnvironmentRemoveWorkdir(t *testing.T) {
|
func TestHostEnvironmentRemoveWorkdir(t *testing.T) {
|
||||||
for name, owned := range map[string]bool{"preserves caller workdir": false, "cleans owned workdir": true} {
|
miscRoot, workdir := t.TempDir(), t.TempDir()
|
||||||
t.Run(name, func(t *testing.T) {
|
e := &HostEnvironment{Path: filepath.Join(miscRoot, "hostexecutor"), Workdir: workdir, Root: miscRoot}
|
||||||
miscRoot, workdir := t.TempDir(), t.TempDir()
|
require.NoError(t, os.MkdirAll(e.Path, 0o700))
|
||||||
e := &HostEnvironment{
|
require.NoError(t, e.Remove()(t.Context()))
|
||||||
Path: filepath.Join(miscRoot, "hostexecutor"),
|
assert.NoDirExists(t, miscRoot)
|
||||||
Workdir: workdir,
|
assert.DirExists(t, workdir)
|
||||||
CleanWorkdir: owned,
|
|
||||||
Root: miscRoot,
|
|
||||||
}
|
|
||||||
require.NoError(t, os.MkdirAll(e.Path, 0o700))
|
|
||||||
require.NoError(t, os.MkdirAll(filepath.Join(miscRoot, "tmp"), 0o700))
|
|
||||||
require.NoError(t, e.Remove()(t.Context()))
|
|
||||||
assert.NoDirExists(t, miscRoot)
|
|
||||||
_, err := os.Stat(workdir)
|
|
||||||
if owned {
|
|
||||||
assert.ErrorIs(t, err, os.ErrNotExist)
|
|
||||||
} else {
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRemoveAllWithContextDoesNotHangOnStuckDelete(t *testing.T) {
|
func TestRemoveAllWithContextDoesNotHangOnStuckDelete(t *testing.T) {
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ type KubernetesPod struct {
|
|||||||
job *kubernetesContainer
|
job *kubernetesContainer
|
||||||
services []*kubernetesContainer
|
services []*kubernetesContainer
|
||||||
arch, path string
|
arch, path string
|
||||||
|
imageOS string
|
||||||
ips []net.IP
|
ips []net.IP
|
||||||
transfer *transferServer
|
transfer *transferServer
|
||||||
transferImage string
|
transferImage string
|
||||||
@@ -432,11 +433,12 @@ func (c *kubernetesContainer) Start(_ bool) common.Executor {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
probed := strings.SplitN(output, "\n", 3)
|
probed := strings.SplitN(output, "\x00", 5)
|
||||||
for len(probed) < 3 {
|
for len(probed) < 5 {
|
||||||
probed = append(probed, "")
|
probed = append(probed, "")
|
||||||
}
|
}
|
||||||
c.pod.arch, c.gzip, c.pod.path = goArchToActionArch(probed[0]), probed[1] == "gzip", probed[2]
|
c.pod.arch, c.gzip, c.pod.path = goArchToActionArch(probed[0]), probed[1] == "gzip", probed[2]
|
||||||
|
c.pod.imageOS = cmp.Or(probed[3], ImageOSFromOSRelease(probed[4]))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -447,7 +449,7 @@ func (p *KubernetesPod) probe(ctx context.Context, container string) (string, er
|
|||||||
deadline := time.Now().Add(time.Minute)
|
deadline := time.Now().Add(time.Minute)
|
||||||
for delay := 100 * time.Millisecond; ; delay = min(2*delay, 2*time.Second) {
|
for delay := 100 * time.Millisecond; ; delay = min(2*delay, 2*time.Second) {
|
||||||
var stdout bytes.Buffer
|
var stdout bytes.Buffer
|
||||||
err := p.client.exec(ctx, p.name, container, []string{"sh", "-c", `printf '%s\n%s\n%s' "$(uname -m)" "$(command -v gzip >/dev/null && echo gzip)" "$PATH"`}, nil, &stdout, io.Discard)
|
err := p.client.exec(ctx, p.name, container, []string{"sh", "-c", `printf '%s\0%s\0%s\0%s\0%s' "$(uname -m)" "$(command -v gzip >/dev/null && echo gzip)" "$PATH" "${ImageOS-}" "$(cat /etc/os-release 2>/dev/null || cat /usr/lib/os-release 2>/dev/null)"`}, nil, &stdout, io.Discard)
|
||||||
var exitErr ExitCodeError
|
var exitErr ExitCodeError
|
||||||
var apiErr *apiError
|
var apiErr *apiError
|
||||||
if err == nil || ctx.Err() != nil || errors.As(err, &exitErr) || time.Now().After(deadline) ||
|
if err == nil || ctx.Err() != nil || errors.As(err, &exitErr) || time.Now().After(deadline) ||
|
||||||
@@ -582,6 +584,9 @@ func (c *kubernetesContainer) UpdateFromEnv(srcPath string, env *map[string]stri
|
|||||||
func (c *kubernetesContainer) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
func (c *kubernetesContainer) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
||||||
return func(context.Context) error {
|
return func(context.Context) error {
|
||||||
(*env)["PATH"] = cmp.Or((*env)["PATH"], c.pod.path)
|
(*env)["PATH"] = cmp.Or((*env)["PATH"], c.pod.path)
|
||||||
|
if c.pod.imageOS != "" {
|
||||||
|
(*env)["ImageOS"] = cmp.Or((*env)["ImageOS"], c.pod.imageOS)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ func TestKubernetesPodRunsJobThroughAPI(t *testing.T) {
|
|||||||
path := workdir + ":" + os.Getenv("PATH")
|
path := workdir + ":" + os.Getenv("PATH")
|
||||||
kubeconfig, cluster := fakeKubernetes(t, `{"spec":{"containers":[{},{}]},"status":{"phase":"Running","containerStatuses":[
|
kubeconfig, cluster := fakeKubernetes(t, `{"spec":{"containers":[{},{}]},"status":{"phase":"Running","containerStatuses":[
|
||||||
{"name":"job","ready":true,"state":{"running":{}}},
|
{"name":"job","ready":true,"state":{"running":{}}},
|
||||||
{"name":"my-db","ready":true,"state":{"running":{}}}]}}`, "PATH="+path)
|
{"name":"my-db","ready":true,"state":{"running":{}}}]}}`, "PATH="+path, "ImageOS=ubuntu24-arm64")
|
||||||
options := KubernetesOptions{Kubeconfig: kubeconfig, RunnerUUID: "runner-uuid", PodTemplates: []map[string]any{
|
options := KubernetesOptions{Kubeconfig: kubeconfig, RunnerUUID: "runner-uuid", PodTemplates: []map[string]any{
|
||||||
{"spec": map[string]any{
|
{"spec": map[string]any{
|
||||||
"automountServiceAccountToken": true,
|
"automountServiceAccountToken": true,
|
||||||
@@ -309,9 +309,9 @@ func TestKubernetesPodRunsJobThroughAPI(t *testing.T) {
|
|||||||
assert.Contains(t, lastExec(), "command="+url.QueryEscape(workdir+"/act/actions/sha/"))
|
assert.Contains(t, lastExec(), "command="+url.QueryEscape(workdir+"/act/actions/sha/"))
|
||||||
assert.Contains(t, lastExec(), url.QueryEscape("gzip -dc |"))
|
assert.Contains(t, lastExec(), url.QueryEscape("gzip -dc |"))
|
||||||
|
|
||||||
pathEnv := map[string]string{}
|
imageEnv := map[string]string{}
|
||||||
require.NoError(t, job.UpdateFromImageEnv(&pathEnv)(ctx))
|
require.NoError(t, job.UpdateFromImageEnv(&imageEnv)(ctx))
|
||||||
assert.Equal(t, path, pathEnv["PATH"])
|
assert.Equal(t, map[string]string{"PATH": path, "ImageOS": "ubuntu24-arm64"}, imageEnv)
|
||||||
|
|
||||||
info, err := service.Inspect(ctx)
|
info, err := service.Inspect(ctx)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|||||||
@@ -108,3 +108,22 @@ func (*LinuxContainerEnvironmentExtensions) GetRunnerContext(ctx context.Context
|
|||||||
func (*LinuxContainerEnvironmentExtensions) IsEnvironmentCaseInsensitive() bool {
|
func (*LinuxContainerEnvironmentExtensions) IsEnvironmentCaseInsensitive() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ImageOSFromOSRelease derives ImageOS from an os-release file, empty for anything but Ubuntu, the only Linux GitHub names one.
|
||||||
|
func ImageOSFromOSRelease(osRelease string) string {
|
||||||
|
var id, major string
|
||||||
|
for line := range strings.Lines(osRelease) {
|
||||||
|
key, value, _ := strings.Cut(strings.TrimSpace(line), "=")
|
||||||
|
value = strings.Trim(value, `"'`)
|
||||||
|
switch key {
|
||||||
|
case "ID":
|
||||||
|
id = value
|
||||||
|
case "VERSION_ID":
|
||||||
|
major, _, _ = strings.Cut(value, ".")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id != "ubuntu" || major == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return id + major
|
||||||
|
}
|
||||||
@@ -346,8 +346,10 @@ func execAsDocker(ctx context.Context, step actionStep, actionName, actionDir, b
|
|||||||
ImageTag: image,
|
ImageTag: image,
|
||||||
Platform: rc.Config.ContainerArchitecture,
|
Platform: rc.Config.ContainerArchitecture,
|
||||||
BuildArgs: rc.proxyBuildArgs(),
|
BuildArgs: rc.proxyBuildArgs(),
|
||||||
|
Stdout: common.NewLineWriter(rawLogLine(ctx)),
|
||||||
}
|
}
|
||||||
if localAction {
|
if localAction {
|
||||||
|
input.Dockerignore, _ = readSingleFileFromContainerArchive(ctx, rc.JobContainer, contextDir+"/.dockerignore", 1<<20)
|
||||||
buildContext, err := rc.JobContainer.GetContainerArchive(ctx, contextDir+"/.")
|
buildContext, err := rc.JobContainer.GetContainerArchive(ctx, contextDir+"/.")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -587,7 +589,8 @@ func shouldRunPreStep(step actionStep) common.Conditional {
|
|||||||
func hasPreStep(step actionStep) common.Conditional {
|
func hasPreStep(step actionStep) common.Conditional {
|
||||||
return func(ctx context.Context) bool {
|
return func(ctx context.Context) bool {
|
||||||
action := step.getActionModel()
|
action := step.getActionModel()
|
||||||
return action.Runs.Using.IsComposite() ||
|
// a pre stage evaluates `with` before earlier steps run, so only a composite nesting actions gets one
|
||||||
|
return (action.Runs.Using.IsComposite() && slices.ContainsFunc(action.Runs.Steps, func(compositeStep model.Step) bool { return compositeStep.Uses != "" })) ||
|
||||||
(action.Runs.Using.IsNode() &&
|
(action.Runs.Using.IsNode() &&
|
||||||
action.Runs.Pre != "") ||
|
action.Runs.Pre != "") ||
|
||||||
(action.Runs.Using.IsDocker() &&
|
(action.Runs.Using.IsDocker() &&
|
||||||
|
|||||||
@@ -217,11 +217,11 @@ func (rc *RunContext) compositeExecutor(action *model.Action) *compositeSteps {
|
|||||||
steps = append(steps, newCompositeStepLogExecutor(rc.newCompositeCommandExecutor(step.main()), stepID))
|
steps = append(steps, newCompositeStepLogExecutor(rc.newCompositeCommandExecutor(step.main()), stepID))
|
||||||
|
|
||||||
// run the post executor in reverse order
|
// run the post executor in reverse order
|
||||||
stepPost := rc.newCompositeCommandExecutor(step.post())
|
stepPost := newCompositeStepLogExecutor(rc.newCompositeCommandExecutor(step.post()), stepID)
|
||||||
if postExecutor != nil {
|
if postExecutor != nil {
|
||||||
stepPost = stepPost.Finally(postExecutor)
|
stepPost = stepPost.Finally(postExecutor)
|
||||||
}
|
}
|
||||||
postExecutor = newCompositeStepLogExecutor(stepPost, stepID)
|
postExecutor = stepPost
|
||||||
}
|
}
|
||||||
|
|
||||||
steps = append(steps, common.JobError)
|
steps = append(steps, common.JobError)
|
||||||
|
|||||||
@@ -99,6 +99,19 @@ func TestCompositeActionParity(t *testing.T) {
|
|||||||
|
|
||||||
require.ErrorIs(t, rc.compositeExecutor(&model.Action{Runs: model.ActionRuns{Using: "composite", Steps: []model.Step{{ID: "nested", Uses: "org/action@v1"}}}}).pre(t.Context()), assert.AnError)
|
require.ErrorIs(t, rc.compositeExecutor(&model.Action{Runs: model.ActionRuns{Using: "composite", Steps: []model.Step{{ID: "nested", Uses: "org/action@v1"}}}}).pre(t.Context()), assert.AnError)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("post steps log under their own step ids", func(t *testing.T) {
|
||||||
|
hook := logtest.NewWithLevel(logging.LevelDebug)
|
||||||
|
rc := &RunContext{Config: &Config{}, JobContainer: &jobContainerMock{}}
|
||||||
|
steps := rc.compositeExecutor(&model.Action{Runs: model.ActionRuns{Using: "composite", Steps: []model.Step{{ID: "first", Uses: "./first"}, {ID: "second", Uses: "./second"}}}})
|
||||||
|
require.NoError(t, steps.post(common.WithLogger(t.Context(), logging.New(hook))))
|
||||||
|
var stepIDs []any
|
||||||
|
for _, record := range hook.AllRecords() {
|
||||||
|
ids, _ := record.Attr("stepID")
|
||||||
|
stepIDs = append(stepIDs, ids)
|
||||||
|
}
|
||||||
|
assert.Equal(t, []any{[]string{"second"}, []string{"first"}}, stepIDs)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAppendUniqueMasks(t *testing.T) {
|
func TestAppendUniqueMasks(t *testing.T) {
|
||||||
|
|||||||
@@ -751,12 +751,15 @@ func TestExecAsDockerStageEntrypoint(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDockerActionHasPreAndPostStep(t *testing.T) {
|
func TestActionHasPreAndPostStep(t *testing.T) {
|
||||||
newStep := func(runs model.ActionRuns) actionStep {
|
newStep := func(runs model.ActionRuns) actionStep {
|
||||||
return &stepActionRemote{action: &model.Action{Runs: runs}}
|
return &stepActionRemote{action: &model.Action{Runs: runs}}
|
||||||
}
|
}
|
||||||
ctx := t.Context()
|
ctx := t.Context()
|
||||||
|
|
||||||
|
assert.False(t, hasPreStep(newStep(model.ActionRuns{Using: "composite", Steps: []model.Step{{Run: "true"}}}))(ctx))
|
||||||
|
assert.True(t, hasPreStep(newStep(model.ActionRuns{Using: "composite", Steps: []model.Step{{Run: "true"}, {Uses: "actions/cache@v4"}}}))(ctx))
|
||||||
|
|
||||||
assert.False(t, hasPreStep(newStep(model.ActionRuns{Using: "docker", Image: "Dockerfile"}))(ctx))
|
assert.False(t, hasPreStep(newStep(model.ActionRuns{Using: "docker", Image: "Dockerfile"}))(ctx))
|
||||||
assert.False(t, hasPostStep(newStep(model.ActionRuns{Using: "docker", Image: "Dockerfile"}))(ctx))
|
assert.False(t, hasPostStep(newStep(model.ActionRuns{Using: "docker", Image: "Dockerfile"}))(ctx))
|
||||||
|
|
||||||
|
|||||||
@@ -101,10 +101,10 @@ func TestMainStepsExecutorRunsAlwaysStepsAfterInterruption(t *testing.T) {
|
|||||||
assert.Equal(t, []string{"step1", "always-step"}, ran)
|
assert.Equal(t, []string{"step1", "always-step"}, ran)
|
||||||
require.NoError(t, laterStepCtxErr)
|
require.NoError(t, laterStepCtxErr)
|
||||||
assert.Equal(t, wantError == context.Canceled, rc.jobCancelled)
|
assert.Equal(t, wantError == context.Canceled, rc.jobCancelled)
|
||||||
|
assert.Equal(t, "cancelled", rc.getJobContext().Status)
|
||||||
setJobResult(t.Context(), rc, rc, true)
|
setJobResult(t.Context(), rc, rc, true)
|
||||||
if wantError == context.DeadlineExceeded {
|
if wantError == context.DeadlineExceeded {
|
||||||
assert.True(t, rc.jobFailed)
|
assert.True(t, rc.jobFailed)
|
||||||
assert.Equal(t, "failure", rc.getJobContext().Status)
|
|
||||||
assert.Equal(t, "failure", rc.Run.Job().Result)
|
assert.Equal(t, "failure", rc.Run.Job().Result)
|
||||||
} else {
|
} else {
|
||||||
assert.Equal(t, "cancelled", rc.Run.Job().Result)
|
assert.Equal(t, "cancelled", rc.Run.Job().Result)
|
||||||
@@ -259,8 +259,11 @@ func TestReportStepErrorTreatsCancelAsInterruption(t *testing.T) {
|
|||||||
assert.True(t, rc.jobCancelled)
|
assert.True(t, rc.jobCancelled)
|
||||||
|
|
||||||
// a real error still fails the job
|
// a real error still fails the job
|
||||||
failed := common.WithJobErrorContainer(t.Context())
|
for _, stepErr := range []error{assert.AnError, context.DeadlineExceeded} {
|
||||||
reportStepError(failed, rc, assert.AnError)
|
rc := &RunContext{}
|
||||||
require.ErrorIs(t, common.JobError(failed), assert.AnError)
|
failed := common.WithJobErrorContainer(t.Context())
|
||||||
assert.True(t, rc.jobFailed)
|
reportStepError(failed, rc, stepErr)
|
||||||
|
require.ErrorIs(t, common.JobError(failed), stepErr)
|
||||||
|
assert.Equal(t, "failure", rc.getJobContext().Status)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -54,6 +54,10 @@ func (cm *containerMock) UpdateFromEnv(srcPath string, env *map[string]string) c
|
|||||||
return cm.Called(srcPath, env).Get(0).(func(context.Context) error)
|
return cm.Called(srcPath, env).Get(0).(func(context.Context) error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (cm *containerMock) UpdateFromImageEnv(_env *map[string]string) common.Executor {
|
||||||
|
return noopExecutor
|
||||||
|
}
|
||||||
|
|
||||||
func (cm *containerMock) Copy(destPath string, files ...*container.FileEntry) common.Executor {
|
func (cm *containerMock) Copy(destPath string, files ...*container.FileEntry) common.Executor {
|
||||||
return cm.Called(destPath, files).Get(0).(func(context.Context) error)
|
return cm.Called(destPath, files).Get(0).(func(context.Context) error)
|
||||||
}
|
}
|
||||||
@@ -68,8 +72,9 @@ func (cm *containerMock) Exec(command []string, env map[string]string, user, wor
|
|||||||
|
|
||||||
func (cm *containerMock) GetContainerArchive(ctx context.Context, srcPath string) (io.ReadCloser, error) {
|
func (cm *containerMock) GetContainerArchive(ctx context.Context, srcPath string) (io.ReadCloser, error) {
|
||||||
args := cm.Called(ctx, srcPath)
|
args := cm.Called(ctx, srcPath)
|
||||||
|
reader, _ := args.Get(0).(io.ReadCloser)
|
||||||
err, _ := args.Get(1).(error)
|
err, _ := args.Get(1).(error)
|
||||||
return args.Get(0).(io.ReadCloser), err
|
return reader, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cm *containerMock) DumpLogs(ctx context.Context) error {
|
func (cm *containerMock) DumpLogs(ctx context.Context) error {
|
||||||
|
|||||||
@@ -324,6 +324,12 @@ func (rc *RunContext) resolveWorkflowCall(ctx context.Context) error {
|
|||||||
if rc.workflowCallSecrets, err = callerEval.EvaluateCallerSecrets(secrets); err != nil {
|
if rc.workflowCallSecrets, err = callerEval.EvaluateCallerSecrets(secrets); err != nil {
|
||||||
return fmt.Errorf("unable to interpolate %w", err)
|
return fmt.Errorf("unable to interpolate %w", err)
|
||||||
}
|
}
|
||||||
|
for _, name := range []string{"GITHUB_TOKEN", "GITEA_TOKEN"} {
|
||||||
|
token, ok := rc.Config.Secrets[name]
|
||||||
|
if _, mapped := common.LookupFold(rc.workflowCallSecrets, name, true); ok && !mapped {
|
||||||
|
rc.workflowCallSecrets[name] = token
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -503,7 +503,7 @@ jobs:
|
|||||||
assert.Equal(t, "workflow", env["INPUT_FALLBACK"])
|
assert.Equal(t, "workflow", env["INPUT_FALLBACK"])
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestResolveWorkflowCallToleratesMismatchesAndPassesInheritedSecretsAndRuntimeToken(t *testing.T) {
|
func TestResolveWorkflowCallToleratesMismatchesAndPassesSecretsAndTokens(t *testing.T) {
|
||||||
callerWorkflow, err := model.ReadWorkflow(strings.NewReader(`
|
callerWorkflow, err := model.ReadWorkflow(strings.NewReader(`
|
||||||
jobs:
|
jobs:
|
||||||
call:
|
call:
|
||||||
@@ -513,6 +513,9 @@ jobs:
|
|||||||
inherit:
|
inherit:
|
||||||
uses: ./reuse.yml
|
uses: ./reuse.yml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
override:
|
||||||
|
uses: ./reuse.yml
|
||||||
|
secrets: {github_token: "${{ secrets.token }}", GITEA_TOKEN: ""}
|
||||||
`))
|
`))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
callee, err := model.ReadWorkflow(strings.NewReader(`
|
callee, err := model.ReadWorkflow(strings.NewReader(`
|
||||||
@@ -527,7 +530,7 @@ jobs:
|
|||||||
notCallable, err := model.ReadWorkflow(strings.NewReader("on: push\njobs:\n test: {}\n"))
|
notCallable, err := model.ReadWorkflow(strings.NewReader("on: push\njobs:\n test: {}\n"))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
config := &Config{
|
config := &Config{
|
||||||
Secrets: map[string]string{"token": "${{ github.token }}"},
|
Secrets: map[string]string{"token": "${{ github.token }}", "GITHUB_TOKEN": "github-token", "GITEA_TOKEN": "gitea-token"},
|
||||||
PresetGitHubContext: &model.GithubContext{},
|
PresetGitHubContext: &model.GithubContext{},
|
||||||
RuntimeTokens: map[*model.Workflow]string{callerWorkflow: "caller-run"},
|
RuntimeTokens: map[*model.Workflow]string{callerWorkflow: "caller-run"},
|
||||||
}
|
}
|
||||||
@@ -541,11 +544,17 @@ jobs:
|
|||||||
|
|
||||||
called := resolve("call", callee)
|
called := resolve("call", callee)
|
||||||
assert.Equal(t, map[string]any{"flag": true}, called.workflowCallInputs)
|
assert.Equal(t, map[string]any{"flag": true}, called.workflowCallInputs)
|
||||||
assert.Equal(t, map[string]string{"undeclared": "${{ github.token }}"}, called.workflowCallSecrets)
|
assert.Equal(t, map[string]string{"undeclared": "${{ github.token }}", "GITHUB_TOKEN": "github-token", "GITEA_TOKEN": "gitea-token"}, called.workflowCallSecrets)
|
||||||
assert.Equal(t, "caller-run", called.GetEnv()["ACTIONS_RUNTIME_TOKEN"])
|
assert.Equal(t, "caller-run", called.GetEnv()["ACTIONS_RUNTIME_TOKEN"])
|
||||||
inherited := resolve("inherit", notCallable)
|
inherited := resolve("inherit", notCallable)
|
||||||
assert.Empty(t, inherited.workflowCallInputs)
|
assert.Empty(t, inherited.workflowCallInputs)
|
||||||
assert.Equal(t, map[string]string{"token": "${{ github.token }}", "ACTIONS_RUNTIME_TOKEN": "caller-run"}, inherited.workflowCallSecrets)
|
assert.Equal(t, map[string]string{"token": "${{ github.token }}", "GITHUB_TOKEN": "github-token", "GITEA_TOKEN": "gitea-token", "ACTIONS_RUNTIME_TOKEN": "caller-run"}, inherited.workflowCallSecrets)
|
||||||
|
assert.Equal(t, "${{ github.token }}:", resolve("override", callee).ExprEval.InterpolateName(t.Context(), "${{ secrets.GITHUB_TOKEN }}:${{ secrets.GITEA_TOKEN }}"))
|
||||||
|
middle, err := model.ReadWorkflow(strings.NewReader("on: workflow_call\njobs:\n test: {uses: ./reuse.yml}\n"))
|
||||||
|
require.NoError(t, err)
|
||||||
|
nested, err := (&runnerImpl{config: config, caller: &caller{runContext: resolve("override", middle)}}).newRunContext(t.Context(), &model.Run{Workflow: callee, JobID: "test"}, nil)
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, "github-token:gitea-token", nested.ExprEval.InterpolateName(t.Context(), "${{ secrets.GITHUB_TOKEN }}:${{ secrets.GITEA_TOKEN }}"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestJobNameMasksSecrets(t *testing.T) {
|
func TestJobNameMasksSecrets(t *testing.T) {
|
||||||
|
|||||||
+10
-8
@@ -44,7 +44,11 @@ func (rc *RunContext) runJobHook(ctx context.Context, hookPath, name string) err
|
|||||||
rc.CurrentStep = ""
|
rc.CurrentStep = ""
|
||||||
defer func() { rc.CurrentStep = previousStep }()
|
defer func() { rc.CurrentStep = previousStep }()
|
||||||
|
|
||||||
cmd, shell := hookCommand(hookPath)
|
env := rc.mergeEnv(rc.defaultEnv, rc.containerSpec.Env, rc.GetEnv())
|
||||||
|
rc.withGithubEnv(ctx, rc.getGithubContext(ctx), env)
|
||||||
|
rc.ApplyExtraPath(ctx, &env)
|
||||||
|
|
||||||
|
cmd, shell := hookCommand(hookPath, func(preferred, fallback string) string { return rc.shellOrFallback(ctx, env, preferred, fallback) })
|
||||||
rawLogger := common.Logger(ctx).With(rawOutputField, true)
|
rawLogger := common.Logger(ctx).With(rawOutputField, true)
|
||||||
rawLogger.Infof("A %s hook has been configured by the runner administrator", name)
|
rawLogger.Infof("A %s hook has been configured by the runner administrator", name)
|
||||||
rawLogger.Infof("::group::Run '%s'", EscapeCommandData(hookPath))
|
rawLogger.Infof("::group::Run '%s'", EscapeCommandData(hookPath))
|
||||||
@@ -53,10 +57,6 @@ func (rc *RunContext) runJobHook(ctx context.Context, hookPath, name string) err
|
|||||||
}
|
}
|
||||||
rawLogger.Infof("::endgroup::")
|
rawLogger.Infof("::endgroup::")
|
||||||
|
|
||||||
env := rc.mergeEnv(rc.caEnv, rc.containerSpec.Env, rc.GetEnv())
|
|
||||||
rc.withGithubEnv(ctx, rc.getGithubContext(ctx), env)
|
|
||||||
rc.ApplyExtraPath(ctx, &env)
|
|
||||||
|
|
||||||
err := rc.setupHookFileCommands(ctx, env)
|
err := rc.setupHookFileCommands(ctx, env)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
err = rc.runWithCommands(ctx, env, func(ctx context.Context) error {
|
err = rc.runWithCommands(ctx, env, func(ctx context.Context) error {
|
||||||
@@ -104,12 +104,14 @@ func (rc *RunContext) processHookFileCommands(ctx context.Context) error {
|
|||||||
// gives `run:` steps — a hook sets its own. See docs/adrs/1751-runner-job-hooks.md there.
|
// gives `run:` steps — a hook sets its own. See docs/adrs/1751-runner-job-hooks.md there.
|
||||||
// The second return value is how the invocation is shown in the log, empty when the file is
|
// The second return value is how the invocation is shown in the log, empty when the file is
|
||||||
// executed directly.
|
// executed directly.
|
||||||
func hookCommand(hookPath string) (cmd []string, shell string) {
|
func hookCommand(hookPath string, shellOrFallback func(preferred, fallback string) string) (cmd []string, shell string) {
|
||||||
switch strings.ToLower(path.Ext(hookPath)) {
|
switch strings.ToLower(path.Ext(hookPath)) {
|
||||||
case ".sh":
|
case ".sh":
|
||||||
return []string{"bash", "-e", hookPath}, "bash -e {0}"
|
shellName := shellOrFallback("bash", "sh")
|
||||||
|
return []string{shellName, "-e", hookPath}, shellName + " -e {0}"
|
||||||
case ".ps1":
|
case ".ps1":
|
||||||
return []string{"pwsh", "-command", ". '" + expressionStringEscape(hookPath) + "'"}, `pwsh -command ". '{0}'"`
|
shellName := shellOrFallback("pwsh", "powershell")
|
||||||
|
return []string{shellName, "-command", ". '" + expressionStringEscape(hookPath) + "'"}, shellName + ` -command ". '{0}'"`
|
||||||
default:
|
default:
|
||||||
return []string{hookPath}, ""
|
return []string{hookPath}, ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ func TestRunJobHook(t *testing.T) {
|
|||||||
rc, ctx := newHookRunContext(jobContainer, &Config{JobStartedHook: "/hooks/started.sh"})
|
rc, ctx := newHookRunContext(jobContainer, &Config{JobStartedHook: "/hooks/started.sh"})
|
||||||
|
|
||||||
require.ErrorContains(t, rc.runJobStartedHook(ctx), "boom")
|
require.ErrorContains(t, rc.runJobStartedHook(ctx), "boom")
|
||||||
assert.Nil(t, jobContainer.cmd)
|
assert.NotContains(t, jobContainer.cmd, "/hooks/started.sh")
|
||||||
assert.NotContains(t, rc.Env, "STALE")
|
assert.NotContains(t, rc.Env, "STALE")
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -242,17 +242,26 @@ func TestRunJobHook(t *testing.T) {
|
|||||||
// actions/runner deliberately runs a hook without the flags it gives `run:` steps, and an
|
// actions/runner deliberately runs a hook without the flags it gives `run:` steps, and an
|
||||||
// executable without a known extension speaks for itself through its shebang.
|
// executable without a known extension speaks for itself through its shebang.
|
||||||
func TestHookCommand(t *testing.T) {
|
func TestHookCommand(t *testing.T) {
|
||||||
for hookPath, want := range map[string]struct {
|
for _, tc := range []struct {
|
||||||
cmd []string
|
hookPath string
|
||||||
shell string
|
hasShell bool
|
||||||
|
cmd []string
|
||||||
|
shell string
|
||||||
}{
|
}{
|
||||||
"/hooks/started.sh": {[]string{"bash", "-e", "/hooks/started.sh"}, "bash -e {0}"},
|
{"/hooks/started.sh", true, []string{"bash", "-e", "/hooks/started.sh"}, "bash -e {0}"},
|
||||||
"/hooks/started.PS1": {[]string{"pwsh", "-command", ". '/hooks/started.PS1'"}, `pwsh -command ". '{0}'"`},
|
{"/hooks/started.sh", false, []string{"sh", "-e", "/hooks/started.sh"}, "sh -e {0}"},
|
||||||
"/hooks/started": {[]string{"/hooks/started"}, ""},
|
{"/hooks/started.PS1", true, []string{"pwsh", "-command", ". '/hooks/started.PS1'"}, `pwsh -command ". '{0}'"`},
|
||||||
`C:\hooks\O'Brien\started.ps1`: {[]string{"pwsh", "-command", `. 'C:\hooks\O''Brien\started.ps1'`}, `pwsh -command ". '{0}'"`},
|
{"/hooks/started.PS1", false, []string{"powershell", "-command", ". '/hooks/started.PS1'"}, `powershell -command ". '{0}'"`},
|
||||||
|
{"/hooks/started", false, []string{"/hooks/started"}, ""},
|
||||||
|
{`C:\hooks\O'Brien\started.ps1`, true, []string{"pwsh", "-command", `. 'C:\hooks\O''Brien\started.ps1'`}, `pwsh -command ". '{0}'"`},
|
||||||
} {
|
} {
|
||||||
cmd, shell := hookCommand(hookPath)
|
cmd, shell := hookCommand(tc.hookPath, func(preferred, fallback string) string {
|
||||||
assert.Equal(t, want.cmd, cmd, hookPath)
|
if tc.hasShell {
|
||||||
assert.Equal(t, want.shell, shell, hookPath)
|
return preferred
|
||||||
|
}
|
||||||
|
return fallback
|
||||||
|
})
|
||||||
|
assert.Equal(t, tc.cmd, cmd, tc.hookPath)
|
||||||
|
assert.Equal(t, tc.shell, shell, tc.hookPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -165,6 +165,10 @@ func setReusedWorkflowCallerResult(rc *RunContext, runner *runnerImpl) common.Ex
|
|||||||
hasFailure = true
|
hasFailure = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if err := setJobOutputs(ctx, rc); err != nil { // a bad output fails this job, as for ordinary jobs
|
||||||
|
common.Logger(ctx).Errorf("##[error]%s", EscapeCommandData(err.Error()))
|
||||||
|
hasFailure = true
|
||||||
|
}
|
||||||
|
|
||||||
reusedWorkflowJobResult := "success"
|
reusedWorkflowJobResult := "success"
|
||||||
reusedWorkflowJobResultMessage := "succeeded"
|
reusedWorkflowJobResultMessage := "succeeded"
|
||||||
@@ -173,14 +177,15 @@ func setReusedWorkflowCallerResult(rc *RunContext, runner *runnerImpl) common.Ex
|
|||||||
reusedWorkflowJobResultMessage = "failed"
|
reusedWorkflowJobResultMessage = "failed"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Serialize this shared Job.Result write against the other matrix combos
|
||||||
|
// and setJobResult (same lockJob key).
|
||||||
|
unlock := lockJob(rc.Run.Job())
|
||||||
|
rc.result(reusedWorkflowJobResult)
|
||||||
|
unlock()
|
||||||
|
|
||||||
if rc.caller != nil {
|
if rc.caller != nil {
|
||||||
rc.caller.setReusedWorkflowJobResult(rc.Run.JobID, reusedWorkflowJobResult)
|
rc.caller.setReusedWorkflowJobResult(rc.Run.JobID, reusedWorkflowJobResult)
|
||||||
} else {
|
} else {
|
||||||
// Serialize this shared Job.Result write against the other matrix combos
|
|
||||||
// and setJobResult (same lockJob key).
|
|
||||||
unlock := lockJob(rc.Run.Job())
|
|
||||||
rc.result(reusedWorkflowJobResult)
|
|
||||||
unlock()
|
|
||||||
common.Logger(ctx).With("jobResult", reusedWorkflowJobResult).Infof("Job %s", reusedWorkflowJobResultMessage)
|
common.Logger(ctx).With("jobResult", reusedWorkflowJobResult).Infof("Job %s", reusedWorkflowJobResultMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@@ -213,3 +214,17 @@ func gitMust(t *testing.T, dir string, args ...string) {
|
|||||||
out, err := cmd.CombinedOutput()
|
out, err := cmd.CombinedOutput()
|
||||||
require.NoError(t, err, "git %v: %s", args, string(out))
|
require.NoError(t, err, "git %v: %s", args, string(out))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSetReusedWorkflowCallerResultFailsOnBadOutputs(t *testing.T) {
|
||||||
|
callerWorkflow, err := model.ReadWorkflow(strings.NewReader("jobs:\n call: {uses: ./reuse.yml}\n"))
|
||||||
|
require.NoError(t, err)
|
||||||
|
called, err := model.ReadWorkflow(strings.NewReader("on:\n workflow_call:\n outputs:\n bad: {value: \"${{ fromJSON('not-json') }}\"}\njobs:\n inner: {uses: ./leaf.yml}\n"))
|
||||||
|
require.NoError(t, err)
|
||||||
|
config := &Config{PresetGitHubContext: &model.GithubContext{}}
|
||||||
|
parent, err := (&runnerImpl{config: config}).newRunContext(t.Context(), &model.Run{Workflow: callerWorkflow, JobID: "call"}, nil)
|
||||||
|
require.NoError(t, err)
|
||||||
|
rc, err := (&runnerImpl{config: config, caller: &caller{runContext: parent, reusedWorkflowJobResults: map[string]string{}}}).newRunContext(t.Context(), &model.Run{Workflow: called, JobID: "inner"}, nil)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.NoError(t, setReusedWorkflowCallerResult(rc, &runnerImpl{caller: &caller{reusedWorkflowJobResults: map[string]string{"leaf": "success"}}})(t.Context()))
|
||||||
|
require.Equal(t, "failure", rc.Run.Job().Result)
|
||||||
|
}
|
||||||
+51
-49
@@ -69,7 +69,7 @@ type RunContext struct {
|
|||||||
kubernetes bool
|
kubernetes bool
|
||||||
containerSpec model.ContainerSpec // container:, resolved once with platformImage
|
containerSpec model.ContainerSpec // container:, resolved once with platformImage
|
||||||
containerEnv yaml.Node // container.env of the kept containerSpec, decoded once the job env resolves
|
containerEnv yaml.Node // container.env of the kept containerSpec, decoded once the job env resolves
|
||||||
caEnv map[string]string // NODE_EXTRA_CA_CERTS for the runner CA, beneath any env the job and its image set
|
defaultEnv map[string]string // ImageOS and the runner CA's NODE_EXTRA_CA_CERTS, beneath any env the job sets
|
||||||
JobName string
|
JobName string
|
||||||
ActionPath string
|
ActionPath string
|
||||||
Parent *RunContext
|
Parent *RunContext
|
||||||
@@ -103,6 +103,7 @@ type RunContext struct {
|
|||||||
// getJobContext report the "cancelled" status so cancelled()/always() evaluate the way
|
// getJobContext report the "cancelled" status so cancelled()/always() evaluate the way
|
||||||
// GitHub Actions does, letting cleanup and always() steps run while normal steps skip.
|
// GitHub Actions does, letting cleanup and always() steps run while normal steps skip.
|
||||||
jobCancelled bool
|
jobCancelled bool
|
||||||
|
jobTimedOut bool
|
||||||
// jobFailed records failures outside normal main-step results, such as action pre-step
|
// jobFailed records failures outside normal main-step results, such as action pre-step
|
||||||
// failures. Those failures must still make success() false and failure() true for later
|
// failures. Those failures must still make success() false and failure() true for later
|
||||||
// main-step if evaluation.
|
// main-step if evaluation.
|
||||||
@@ -160,12 +161,13 @@ func (rc *RunContext) markFailed() {
|
|||||||
// markInterrupted records the job's interruption status from a context error so later step `if` evaluations and the job result observe it,
|
// markInterrupted records the job's interruption status from a context error so later step `if` evaluations and the job result observe it,
|
||||||
// keeping the timeout path symmetric with the cancel path:
|
// keeping the timeout path symmetric with the cancel path:
|
||||||
// - context.Canceled (server cancel) marks the job cancelled, matching GitHub's "only always()/cancelled() run on cancel".
|
// - context.Canceled (server cancel) marks the job cancelled, matching GitHub's "only always()/cancelled() run on cancel".
|
||||||
// - context.DeadlineExceeded (job timeout-minutes) marks the job failed, matching the "Timeout -> FAILURE" reporting semantics.
|
// - context.DeadlineExceeded (job timeout-minutes) evaluates later steps as cancelled like GitHub, but reports the job failed.
|
||||||
func (rc *RunContext) markInterrupted(err error) {
|
func (rc *RunContext) markInterrupted(err error) {
|
||||||
switch {
|
switch {
|
||||||
case errors.Is(err, context.Canceled):
|
case errors.Is(err, context.Canceled):
|
||||||
rc.markCancelled()
|
rc.markCancelled()
|
||||||
case errors.Is(err, context.DeadlineExceeded):
|
case errors.Is(err, context.DeadlineExceeded):
|
||||||
|
rc.jobTimedOut = true
|
||||||
rc.markFailed()
|
rc.markFailed()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -468,16 +470,15 @@ func (rc *RunContext) startHostEnvironment() common.Executor {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
rc.JobContainer = &container.HostEnvironment{
|
rc.JobContainer = &container.HostEnvironment{
|
||||||
Path: path,
|
Path: path,
|
||||||
TmpDir: runnerTmp,
|
TmpDir: runnerTmp,
|
||||||
ToolCache: toolCache,
|
ToolCache: toolCache,
|
||||||
Workdir: rc.Config.Workdir,
|
Workdir: rc.Config.Workdir,
|
||||||
CleanWorkdir: rc.Config.CleanWorkdir,
|
ActPath: actPath,
|
||||||
ActPath: actPath,
|
Root: miscpath,
|
||||||
Root: miscpath,
|
TrackingID: rc.runnerTrackingID(),
|
||||||
TrackingID: rc.runnerTrackingID(),
|
StdOut: logWriter,
|
||||||
StdOut: logWriter,
|
AllocatePTY: rc.Config.AllocatePTY,
|
||||||
AllocatePTY: rc.Config.AllocatePTY,
|
|
||||||
}
|
}
|
||||||
rc.cleanUpJobContainer = rc.JobContainer.Remove()
|
rc.cleanUpJobContainer = rc.JobContainer.Remove()
|
||||||
rc.setRunnerContextEnv(ctx)
|
rc.setRunnerContextEnv(ctx)
|
||||||
@@ -655,6 +656,11 @@ func (rc *RunContext) startJobContainer() common.Executor {
|
|||||||
rc.serviceContainers = append(rc.serviceContainers, &serviceContainer{name: serviceID, image: input.Image, container: newContainer(input)})
|
rc.serviceContainers = append(rc.serviceContainers, &serviceContainer{name: serviceID, image: input.Image, container: newContainer(input)})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exposedPorts, portBindings, err := nat.ParsePortSpecs(rc.containerSpec.Ports)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to parse container ports: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
ext := container.LinuxContainerEnvironmentExtensions{}
|
ext := container.LinuxContainerEnvironmentExtensions{}
|
||||||
containerInput := &container.NewContainerInput{
|
containerInput := &container.NewContainerInput{
|
||||||
Entrypoint: []string{"sleep", strconv.FormatInt(int64(rc.Config.ContainerMaxLifetime.Round(time.Second).Seconds()), 10)},
|
Entrypoint: []string{"sleep", strconv.FormatInt(int64(rc.Config.ContainerMaxLifetime.Round(time.Second).Seconds()), 10)},
|
||||||
@@ -666,6 +672,8 @@ func (rc *RunContext) startJobContainer() common.Executor {
|
|||||||
Env: envList,
|
Env: envList,
|
||||||
NetworkMode: networkName,
|
NetworkMode: networkName,
|
||||||
NetworkAliases: []string{rc.Name},
|
NetworkAliases: []string{rc.Name},
|
||||||
|
ExposedPorts: exposedPorts,
|
||||||
|
PortBindings: portBindings,
|
||||||
Stdout: logWriter,
|
Stdout: logWriter,
|
||||||
Stderr: logWriter,
|
Stderr: logWriter,
|
||||||
Privileged: rc.Config.Privileged,
|
Privileged: rc.Config.Privileged,
|
||||||
@@ -1210,6 +1218,24 @@ func (svc *serviceContainer) healthOutputSuffix() string {
|
|||||||
|
|
||||||
func (rc *RunContext) copyWorkflowFiles() common.Executor {
|
func (rc *RunContext) copyWorkflowFiles() common.Executor {
|
||||||
return func(ctx context.Context) error {
|
return func(ctx context.Context) error {
|
||||||
|
imageEnv := map[string]string{}
|
||||||
|
imageEnvErr := rc.JobContainer.UpdateFromImageEnv(&imageEnv)(ctx)
|
||||||
|
rc.defaultEnv = map[string]string{}
|
||||||
|
imageOS, set := imageEnv["ImageOS"]
|
||||||
|
if !set {
|
||||||
|
if !rc.kubernetes { // a pod reports its release through its startup probe
|
||||||
|
for _, osReleasePath := range []string{"/usr/lib/os-release", "/etc/os-release"} { // the archive skips symlinks, as /etc's is on Ubuntu
|
||||||
|
if osRelease, ok := readSingleFileFromContainerArchive(ctx, rc.JobContainer, osReleasePath, 64<<10); ok {
|
||||||
|
imageOS = container.ImageOSFromOSRelease(string(osRelease))
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
imageOS = cmp.Or(imageOS, imageOSFromImage(rc.platformImage))
|
||||||
|
}
|
||||||
|
if set || imageOS != "" {
|
||||||
|
rc.defaultEnv["ImageOS"] = imageOS
|
||||||
|
}
|
||||||
files := []*container.FileEntry{
|
files := []*container.FileEntry{
|
||||||
{Name: "workflow/event.json", Mode: 0o644, Body: rc.EventJSON},
|
{Name: "workflow/event.json", Mode: 0o644, Body: rc.EventJSON},
|
||||||
{Name: "workflow/envs.txt", Mode: 0o666},
|
{Name: "workflow/envs.txt", Mode: 0o666},
|
||||||
@@ -1220,12 +1246,11 @@ func (rc *RunContext) copyWorkflowFiles() common.Executor {
|
|||||||
return fmt.Errorf("read runner CA file: %w", err)
|
return fmt.Errorf("read runner CA file: %w", err)
|
||||||
}
|
}
|
||||||
files = append(files, &container.FileEntry{Name: "ca.crt", Mode: 0o644, Body: string(ca)})
|
files = append(files, &container.FileEntry{Name: "ca.crt", Mode: 0o644, Body: string(ca)})
|
||||||
imageEnv := map[string]string{}
|
if imageEnvErr != nil {
|
||||||
if err = rc.JobContainer.UpdateFromImageEnv(&imageEnv)(ctx); err != nil {
|
return imageEnvErr
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
if _, set := imageEnv["NODE_EXTRA_CA_CERTS"]; !set {
|
if _, set := imageEnv["NODE_EXTRA_CA_CERTS"]; !set {
|
||||||
rc.caEnv = map[string]string{"NODE_EXTRA_CA_CERTS": rc.jobCAFile()}
|
rc.defaultEnv["NODE_EXTRA_CA_CERTS"] = rc.jobCAFile()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return rc.JobContainer.Copy(rc.JobContainer.GetActPath()+"/", files...)(ctx)
|
return rc.JobContainer.Copy(rc.JobContainer.GetActPath()+"/", files...)(ctx)
|
||||||
@@ -1598,7 +1623,7 @@ func (rc *RunContext) getJobContext() *model.JobContext {
|
|||||||
// A cancelled run takes precedence over success/failure so cancelled() is true and
|
// A cancelled run takes precedence over success/failure so cancelled() is true and
|
||||||
// success()/failure() are false, matching GitHub Actions: on cancellation only
|
// success()/failure() are false, matching GitHub Actions: on cancellation only
|
||||||
// always() and cancelled() steps run.
|
// always() and cancelled() steps run.
|
||||||
if job.jobCancelled {
|
if job.jobCancelled || job.jobTimedOut {
|
||||||
jobStatus = "cancelled"
|
jobStatus = "cancelled"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1635,7 +1660,7 @@ func (rc *RunContext) getRunnerContext(ctx context.Context) map[string]any {
|
|||||||
runnerContext["name"] = rc.Config.RunnerName
|
runnerContext["name"] = rc.Config.RunnerName
|
||||||
runnerContext["environment"] = "self-hosted"
|
runnerContext["environment"] = "self-hosted"
|
||||||
runnerContext["workspace"] = parentDir(rc.githubWorkspace())
|
runnerContext["workspace"] = parentDir(rc.githubWorkspace())
|
||||||
if rc.Config.RunnerDebug() {
|
if rc.topLevelRunContext().Config.RunnerDebug() { // a composite's config has no secrets
|
||||||
runnerContext["debug"] = "1"
|
runnerContext["debug"] = "1"
|
||||||
}
|
}
|
||||||
return runnerContext
|
return runnerContext
|
||||||
@@ -1679,7 +1704,9 @@ func (rc *RunContext) getGithubContext(ctx context.Context) *model.GithubContext
|
|||||||
Workspace: rc.githubWorkspace(),
|
Workspace: rc.githubWorkspace(),
|
||||||
}
|
}
|
||||||
if rc.JobContainer != nil {
|
if rc.JobContainer != nil {
|
||||||
ghc.EventPath = rc.JobContainer.GetActPath() + "/workflow/event.json"
|
actPath := rc.JobContainer.GetActPath()
|
||||||
|
ghc.EventPath = actPath + "/workflow/event.json"
|
||||||
|
ghc.Env, ghc.Path = container.JoinPath(actPath, envFileCommand), container.JoinPath(actPath, pathFileCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
ghc.RunnerTrackingID = rc.runnerTrackingID()
|
ghc.RunnerTrackingID = rc.runnerTrackingID()
|
||||||
@@ -1687,6 +1714,7 @@ func (rc *RunContext) getGithubContext(ctx context.Context) *model.GithubContext
|
|||||||
if preset := rc.Config.PresetGitHubContext; preset != nil {
|
if preset := rc.Config.PresetGitHubContext; preset != nil {
|
||||||
merged := *preset
|
merged := *preset
|
||||||
merged.Workflow, merged.Job, merged.Workspace, merged.EventPath = ghc.Workflow, ghc.Job, ghc.Workspace, ghc.EventPath
|
merged.Workflow, merged.Job, merged.Workspace, merged.EventPath = ghc.Workflow, ghc.Job, ghc.Workspace, ghc.EventPath
|
||||||
|
merged.Env, merged.Path = ghc.Env, ghc.Path
|
||||||
merged.Action, merged.ActionPath, merged.ActionRepository, merged.ActionRef = ghc.Action, ghc.ActionPath, ghc.ActionRepository, ghc.ActionRef
|
merged.Action, merged.ActionPath, merged.ActionRepository, merged.ActionRef = ghc.Action, ghc.ActionPath, ghc.ActionRepository, ghc.ActionRef
|
||||||
merged.RunnerPerflog, merged.RunnerTrackingID = ghc.RunnerPerflog, ghc.RunnerTrackingID
|
merged.RunnerPerflog, merged.RunnerTrackingID = ghc.RunnerPerflog, ghc.RunnerTrackingID
|
||||||
*ghc = merged
|
*ghc = merged
|
||||||
@@ -1780,7 +1808,7 @@ func aliasGiteaEnv(env map[string]string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rc *RunContext) withGithubEnv(ctx context.Context, github *model.GithubContext, env map[string]string) {
|
func (rc *RunContext) withGithubEnv(_ctx context.Context, github *model.GithubContext, env map[string]string) {
|
||||||
if _, ok := env["CI"]; !ok {
|
if _, ok := env["CI"]; !ok {
|
||||||
env["CI"] = "true"
|
env["CI"] = "true"
|
||||||
}
|
}
|
||||||
@@ -1841,7 +1869,7 @@ func (rc *RunContext) withGithubEnv(ctx context.Context, github *model.GithubCon
|
|||||||
if workspace := parentDir(github.Workspace); workspace != "" {
|
if workspace := parentDir(github.Workspace); workspace != "" {
|
||||||
env["RUNNER_WORKSPACE"] = workspace
|
env["RUNNER_WORKSPACE"] = workspace
|
||||||
}
|
}
|
||||||
if rc.Config.RunnerDebug() {
|
if rc.topLevelRunContext().Config.RunnerDebug() {
|
||||||
env["RUNNER_DEBUG"] = "1"
|
env["RUNNER_DEBUG"] = "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1849,10 +1877,6 @@ func (rc *RunContext) withGithubEnv(ctx context.Context, github *model.GithubCon
|
|||||||
env["ACTIONS_RUNTIME_URL"] = cmp.Or(os.Getenv("ACTIONS_RUNTIME_URL"), "http://"+net.JoinHostPort(rc.Config.ArtifactServerAddr, rc.Config.ArtifactServerPort)+"/")
|
env["ACTIONS_RUNTIME_URL"] = cmp.Or(os.Getenv("ACTIONS_RUNTIME_URL"), "http://"+net.JoinHostPort(rc.Config.ArtifactServerAddr, rc.Config.ArtifactServerPort)+"/")
|
||||||
env["ACTIONS_RUNTIME_TOKEN"] = cmp.Or(rc.runtimeToken, os.Getenv("ACTIONS_RUNTIME_TOKEN"), "token")
|
env["ACTIONS_RUNTIME_TOKEN"] = cmp.Or(rc.runtimeToken, os.Getenv("ACTIONS_RUNTIME_TOKEN"), "token")
|
||||||
}
|
}
|
||||||
|
|
||||||
if imageOS := rc.imageOS(ctx); imageOS != "" {
|
|
||||||
env["ImageOS"] = imageOS
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// parentDir returns the directory containing p, or "" when p names no parent. Both
|
// parentDir returns the directory containing p, or "" when p names no parent. Both
|
||||||
@@ -1865,32 +1889,10 @@ func parentDir(p string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// imageOS returns ImageOS, which setup-* actions use to tell one runner image release
|
|
||||||
// from another. The resolved image tag is preferred over the runs-on label because it
|
|
||||||
// still names a release when the label is a rolling one such as ubuntu-latest.
|
|
||||||
func (rc *RunContext) imageOS(ctx context.Context) string {
|
|
||||||
if rc.Run.Job().RunsOn() == nil {
|
|
||||||
return "" // a composite action runs on a synthetic job without runs-on
|
|
||||||
}
|
|
||||||
if imageOS := imageOSFromImage(rc.platformImage); imageOS != "" {
|
|
||||||
return imageOS
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, platformName := range slices.Backward(rc.runsOnPlatformNames(ctx)) {
|
|
||||||
if platformName == "ubuntu-latest" {
|
|
||||||
// Rolling label whose image names no release either, so keep the historical value.
|
|
||||||
return "ubuntu20"
|
|
||||||
} else if platformName != "" {
|
|
||||||
return strings.SplitN(strings.Replace(platformName, `-`, ``, 1), `.`, 2)[0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// imageOSTag matches an image reference tagged with an OS family ImageOS can report plus
|
// imageOSTag matches an image reference tagged with an OS family ImageOS can report plus
|
||||||
// its release, such as "docker.gitea.com/runner-images:ubuntu-24.04". Anything else
|
// its release, such as "docker.gitea.com/runner-images:ubuntu-24.04". Anything else
|
||||||
// ("ubuntu-latest", "app:22.04", "catthehacker/ubuntu:act-22.04", or a registry port) is
|
// ("ubuntu-latest", "app:22.04", "catthehacker/ubuntu:act-22.04", or a registry port)
|
||||||
// left to the runs-on label rather than turned into a bogus OS.
|
// yields no ImageOS rather than a bogus OS.
|
||||||
var imageOSTag = regexp.MustCompile(`:(ubuntu|win|macos)-?([0-9]+)[^/]*$`)
|
var imageOSTag = regexp.MustCompile(`:(ubuntu|win|macos)-?([0-9]+)[^/]*$`)
|
||||||
|
|
||||||
// imageOSFromImage derives ImageOS from an image reference, e.g.
|
// imageOSFromImage derives ImageOS from an image reference, e.g.
|
||||||
|
|||||||
@@ -168,6 +168,14 @@ func (fakeContainer) Copy(string, ...*container.FileEntry) common.Executor {
|
|||||||
return func(context.Context) error { return nil }
|
return func(context.Context) error { return nil }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (fakeContainer) UpdateFromImageEnv(_env *map[string]string) common.Executor {
|
||||||
|
return noopExecutor
|
||||||
|
}
|
||||||
|
|
||||||
|
func (fakeContainer) GetContainerArchive(_ctx context.Context, _srcPath string) (io.ReadCloser, error) {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
|
||||||
func (fakeContainer) Inspect(context.Context) (*container.Info, error) {
|
func (fakeContainer) Inspect(context.Context) (*container.Info, error) {
|
||||||
return &container.Info{ID: "fake", State: "running", Health: container.HealthNone}, nil
|
return &container.Info{ID: "fake", State: "running", Health: container.HealthNone}, nil
|
||||||
}
|
}
|
||||||
@@ -342,6 +350,7 @@ jobs:
|
|||||||
container:
|
container:
|
||||||
image: node:20
|
image: node:20
|
||||||
credentials: {username: "${{ env.REG_USER }}", password: pass}
|
credentials: {username: "${{ env.REG_USER }}", password: pass}
|
||||||
|
ports: ["8080:80"]
|
||||||
services:
|
services:
|
||||||
redis:
|
redis:
|
||||||
image: redis:latest
|
image: redis:latest
|
||||||
@@ -351,6 +360,7 @@ jobs:
|
|||||||
`, &Config{Vars: map[string]string{"REG_USER": "user", "TEXT": "${{ 'literal' }}"}})
|
`, &Config{Vars: map[string]string{"REG_USER": "user", "TEXT": "${{ 'literal' }}"}})
|
||||||
redis, job = inputs[0], inputs[1]
|
redis, job = inputs[0], inputs[1]
|
||||||
require.Equal(t, "user", job.Username)
|
require.Equal(t, "user", job.Username)
|
||||||
|
require.Equal(t, "8080", job.PortBindings["80/tcp"][0].HostPort)
|
||||||
require.Equal(t, "user", redis.Username)
|
require.Equal(t, "user", redis.Username)
|
||||||
require.Equal(t, []string{"TEXT=${{ 'literal' }}"}, redis.Env)
|
require.Equal(t, []string{"TEXT=${{ 'literal' }}"}, redis.Env)
|
||||||
require.Equal(t, "--volumes-from "+job.Name, redis.WorkflowOptions)
|
require.Equal(t, "--volumes-from "+job.Name, redis.WorkflowOptions)
|
||||||
@@ -1393,6 +1403,7 @@ func TestRunContext_cleanupFailedStart(t *testing.T) {
|
|||||||
instance.On("Close").Return(record(name+".Close", nil))
|
instance.On("Close").Return(record(name+".Close", nil))
|
||||||
}
|
}
|
||||||
job.On("Copy", mock.Anything, mock.Anything).Return(record("job.Copy", nil))
|
job.On("Copy", mock.Anything, mock.Anything).Return(record("job.Copy", nil))
|
||||||
|
job.On("GetContainerArchive", mock.Anything, mock.Anything).Return(nil, os.ErrNotExist)
|
||||||
job.On("Inspect", mock.Anything).Return(&container.Info{ID: "job-id"}, nil).
|
job.On("Inspect", mock.Anything).Return(&container.Info{ID: "job-id"}, nil).
|
||||||
Run(func(mock.Arguments) { operations = append(operations, "job.Inspect") })
|
Run(func(mock.Arguments) { operations = append(operations, "job.Inspect") })
|
||||||
for _, health := range []string{container.HealthStarting, testcase.health} {
|
for _, health := range []string{container.HealthStarting, testcase.health} {
|
||||||
@@ -1606,13 +1617,21 @@ func TestGetJobContextReportsContainers(t *testing.T) {
|
|||||||
|
|
||||||
type imageEnvContainer struct {
|
type imageEnvContainer struct {
|
||||||
*container.HostEnvironment
|
*container.HostEnvironment
|
||||||
imageEnv map[string]string
|
imageEnv map[string]string
|
||||||
|
osRelease []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c imageEnvContainer) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
func (c imageEnvContainer) UpdateFromImageEnv(env *map[string]string) common.Executor {
|
||||||
return func(_ctx context.Context) error { maps.Copy(*env, c.imageEnv); return nil }
|
return func(_ctx context.Context) error { maps.Copy(*env, c.imageEnv); return nil }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c imageEnvContainer) GetContainerArchive(_ctx context.Context, srcPath string) (io.ReadCloser, error) {
|
||||||
|
if srcPath != "/usr/lib/os-release" || c.osRelease == nil {
|
||||||
|
return nil, os.ErrNotExist
|
||||||
|
}
|
||||||
|
return io.NopCloser(bytes.NewReader(c.osRelease)), nil
|
||||||
|
}
|
||||||
|
|
||||||
func TestCopyWorkflowFilesHandsNodeTheRunnerCAUnlessTheJobOrImageSetsIt(t *testing.T) {
|
func TestCopyWorkflowFilesHandsNodeTheRunnerCAUnlessTheJobOrImageSetsIt(t *testing.T) {
|
||||||
caFile, actPath := filepath.Join(t.TempDir(), "ca.crt"), t.TempDir()
|
caFile, actPath := filepath.Join(t.TempDir(), "ca.crt"), t.TempDir()
|
||||||
require.NoError(t, os.WriteFile(caFile, []byte("PEM\n"), 0o600))
|
require.NoError(t, os.WriteFile(caFile, []byte("PEM\n"), 0o600))
|
||||||
@@ -1622,7 +1641,7 @@ func TestCopyWorkflowFilesHandsNodeTheRunnerCAUnlessTheJobOrImageSetsIt(t *testi
|
|||||||
Config: &Config{CAFile: caFile},
|
Config: &Config{CAFile: caFile},
|
||||||
Run: &model.Run{JobID: "job", Workflow: &model.Workflow{Jobs: map[string]*model.Job{"job": {}}}},
|
Run: &model.Run{JobID: "job", Workflow: &model.Workflow{Jobs: map[string]*model.Job{"job": {}}}},
|
||||||
Env: maps.Clone(jobEnv),
|
Env: maps.Clone(jobEnv),
|
||||||
JobContainer: imageEnvContainer{&container.HostEnvironment{Path: t.TempDir(), ActPath: actPath, StdOut: io.Discard}, imageEnv},
|
JobContainer: imageEnvContainer{&container.HostEnvironment{Path: t.TempDir(), ActPath: actPath, StdOut: io.Discard}, imageEnv, nil},
|
||||||
}
|
}
|
||||||
rc.containerSpec.Env = containerEnv
|
rc.containerSpec.Env = containerEnv
|
||||||
require.NoError(t, rc.copyWorkflowFiles()(t.Context()))
|
require.NoError(t, rc.copyWorkflowFiles()(t.Context()))
|
||||||
@@ -1738,29 +1757,30 @@ func TestRunContextContainerImageCannotSelectBackend(t *testing.T) {
|
|||||||
|
|
||||||
func TestRunContextImageOS(t *testing.T) {
|
func TestRunContextImageOS(t *testing.T) {
|
||||||
ctx := t.Context()
|
ctx := t.Context()
|
||||||
|
ubuntu := tarArchive(t, tarEntry{name: "os-release", body: "ID=ubuntu\nVERSION_ID=\"22.04\"\n"})
|
||||||
t.Run("prefers the release in the resolved image tag", func(t *testing.T) {
|
debian := tarArchive(t, tarEntry{name: "os-release", body: "ID=debian\nVERSION_ID=\"12\"\n"})
|
||||||
rc := createRunsOnRunContext(t, "ubuntu-latest")
|
for _, tc := range []struct {
|
||||||
rc.Config.PlatformPicker = func([]string) string { return "docker.gitea.com/runner-images:ubuntu-24.04" }
|
image string
|
||||||
require.NoError(t, rc.resolvePlatformImage(ctx))
|
imageEnv map[string]string
|
||||||
assert.Equal(t, "ubuntu24", rc.imageOS(ctx))
|
jobEnv string
|
||||||
})
|
osRelease []byte
|
||||||
|
want string
|
||||||
t.Run("falls back to the runs-on label", func(t *testing.T) {
|
}{
|
||||||
rc := createRunsOnRunContext(t, "ubuntu-22.04")
|
{imageEnv: map[string]string{"ImageOS": "ubuntu24-arm64"}, osRelease: ubuntu, want: "ubuntu24-arm64"},
|
||||||
rc.Config.PlatformPicker = func([]string) string { return "some-image" }
|
{imageEnv: map[string]string{"ImageOS": "ubuntu24-arm64"}, jobEnv: "ImageOS: ubuntu20", want: "ubuntu20"},
|
||||||
require.NoError(t, rc.resolvePlatformImage(ctx))
|
{osRelease: ubuntu, want: "ubuntu22"},
|
||||||
assert.Equal(t, "ubuntu22", rc.imageOS(ctx))
|
{image: "docker.gitea.com/runner-images:ubuntu-24.04", osRelease: debian, want: "ubuntu24"},
|
||||||
})
|
{image: "docker.gitea.com/runner-images:ubuntu-latest-slim", osRelease: debian},
|
||||||
|
} {
|
||||||
t.Run("keeps the historical value for a rolling label with no release", func(t *testing.T) {
|
rc := createRunsOnRunContext(t, "ubuntu-latest\nenv: {"+tc.jobEnv+"}")
|
||||||
assert.Equal(t, "ubuntu20", createRunsOnRunContext(t, "ubuntu-latest").imageOS(ctx))
|
rc.platformImage = tc.image
|
||||||
})
|
rc.JobContainer = imageEnvContainer{&container.HostEnvironment{ActPath: t.TempDir()}, tc.imageEnv, tc.osRelease}
|
||||||
|
require.NoError(t, rc.copyWorkflowFiles()(ctx))
|
||||||
t.Run("is empty for the synthetic job of a composite action", func(t *testing.T) {
|
require.NoError(t, evaluateJobEnvAndDefaults(ctx, rc))
|
||||||
rc := createIfTestRunContext(map[string]*model.Job{"job1": {}})
|
env := map[string]string{}
|
||||||
assert.Empty(t, rc.imageOS(ctx))
|
require.NoError(t, setupEnv(ctx, &stepRun{RunContext: rc, Step: &model.Step{}, env: env}))
|
||||||
})
|
assert.Equal(t, tc.want, env["ImageOS"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRunContextGetRunnerContext(t *testing.T) {
|
func TestRunContextGetRunnerContext(t *testing.T) {
|
||||||
@@ -1781,23 +1801,33 @@ func TestRunContextGetRunnerContext(t *testing.T) {
|
|||||||
assert.NotContains(t, runnerContext, "debug")
|
assert.NotContains(t, runnerContext, "debug")
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("reports debug when step debugging is on", func(t *testing.T) {
|
t.Run("reports debug from the secret, else the variable, also in composites", func(t *testing.T) {
|
||||||
rc := createRunsOnRunContext(t, "ubuntu-latest")
|
rc := createRunsOnRunContext(t, "ubuntu-latest")
|
||||||
rc.Config.Secrets = map[string]string{"ACTIONS_STEP_DEBUG": "true"}
|
rc.Config.Secrets = map[string]string{"ACTIONS_STEP_DEBUG": "true"}
|
||||||
|
|
||||||
assert.Equal(t, "1", rc.getRunnerContext(ctx)["debug"])
|
assert.Equal(t, "1", rc.getRunnerContext(ctx)["debug"])
|
||||||
|
assert.Equal(t, "1", (&RunContext{Parent: rc, Config: &Config{}}).getRunnerContext(ctx)["debug"])
|
||||||
|
|
||||||
|
rc.Config.Secrets = map[string]string{}
|
||||||
|
rc.Config.Vars = map[string]string{"ACTIONS_STEP_DEBUG": "true"}
|
||||||
|
assert.Equal(t, "1", rc.getRunnerContext(ctx)["debug"])
|
||||||
|
|
||||||
|
rc.Config.Secrets = map[string]string{"ACTIONS_STEP_DEBUG": "false"}
|
||||||
|
assert.NotContains(t, rc.getRunnerContext(ctx), "debug")
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("keeps the execution environment values", func(t *testing.T) {
|
t.Run("keeps the execution environment values", func(t *testing.T) {
|
||||||
rc := createRunsOnRunContext(t, "ubuntu-latest")
|
rc := createRunsOnRunContext(t, "ubuntu-latest")
|
||||||
rc.Config.Workdir = "/host/work/owner/repo"
|
rc.Config.Workdir = "/host/work/owner/repo"
|
||||||
rc.JobContainer = &container.HostEnvironment{Workdir: rc.Config.Workdir, Path: "/container/work/owner/repo", TmpDir: "/tmp/act", ToolCache: "/tmp/tool_cache"}
|
rc.JobContainer = &container.HostEnvironment{Workdir: rc.Config.Workdir, Path: "/container/work/owner/repo", TmpDir: "/tmp/act", ToolCache: "/tmp/tool_cache", ActPath: "/tmp/act-files"}
|
||||||
|
|
||||||
runnerContext := rc.getRunnerContext(ctx)
|
runnerContext := rc.getRunnerContext(ctx)
|
||||||
assert.Equal(t, "/tmp/act", runnerContext["temp"])
|
assert.Equal(t, "/tmp/act", runnerContext["temp"])
|
||||||
assert.Equal(t, "/tmp/tool_cache", runnerContext["tool_cache"])
|
assert.Equal(t, "/tmp/tool_cache", runnerContext["tool_cache"])
|
||||||
assert.Equal(t, "/container/work/owner", runnerContext["workspace"])
|
assert.Equal(t, "/container/work/owner", runnerContext["workspace"])
|
||||||
assert.Equal(t, "/container/work/owner/repo", rc.getGithubContext(ctx).Workspace)
|
githubContext := rc.getGithubContext(ctx)
|
||||||
|
assert.Equal(t, "/container/work/owner/repo", githubContext.Workspace)
|
||||||
|
assert.Equal(t, "/tmp/act-files/workflow/envs.txt", githubContext.Env)
|
||||||
|
assert.Equal(t, "/tmp/act-files/workflow/pathcmd.txt", githubContext.Path)
|
||||||
assert.NotEmpty(t, runnerContext["os"])
|
assert.NotEmpty(t, runnerContext["os"])
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ type Config struct {
|
|||||||
EventJSON string // the content of JSON file to use for event.json in containers, overrides EventPath
|
EventJSON string // the content of JSON file to use for event.json in containers, overrides EventPath
|
||||||
ContainerNamePrefix string // the prefix of container name
|
ContainerNamePrefix string // the prefix of container name
|
||||||
ContainerMaxLifetime time.Duration // the max lifetime of job containers
|
ContainerMaxLifetime time.Duration // the max lifetime of job containers
|
||||||
CleanWorkdir bool // remove host executor workdir on teardown
|
|
||||||
DefaultActionInstance string // the default actions web site
|
DefaultActionInstance string // the default actions web site
|
||||||
// DefaultActionInstanceIsSelfHosted reports whether DefaultActionInstance is this
|
// DefaultActionInstanceIsSelfHosted reports whether DefaultActionInstance is this
|
||||||
// self-hosted Gitea (DEFAULT_ACTIONS_URL=self). It gates token trust: only then may the
|
// self-hosted Gitea (DEFAULT_ACTIONS_URL=self). It gates token trust: only then may the
|
||||||
@@ -100,7 +99,11 @@ type Config struct {
|
|||||||
|
|
||||||
// RunnerDebug reports whether debug logging is on, exposed as `runner.debug` and RUNNER_DEBUG.
|
// RunnerDebug reports whether debug logging is on, exposed as `runner.debug` and RUNNER_DEBUG.
|
||||||
func (c Config) RunnerDebug() bool {
|
func (c Config) RunnerDebug() bool {
|
||||||
return c.Secrets["ACTIONS_STEP_DEBUG"] == "true" || c.Env["ACTIONS_STEP_DEBUG"] == "true"
|
stepDebug, ok := c.Secrets["ACTIONS_STEP_DEBUG"]
|
||||||
|
if !ok {
|
||||||
|
stepDebug = c.Vars["ACTIONS_STEP_DEBUG"]
|
||||||
|
}
|
||||||
|
return stepDebug == "true" || c.Env["ACTIONS_STEP_DEBUG"] == "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetToken: Adapt to Gitea
|
// GetToken: Adapt to Gitea
|
||||||
|
|||||||
+6
-4
@@ -21,6 +21,11 @@ import (
|
|||||||
"gitea.dev/actionslib/pkg/model"
|
"gitea.dev/actionslib/pkg/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
pathFileCommand = "workflow/pathcmd.txt"
|
||||||
|
envFileCommand = "workflow/envs.txt"
|
||||||
|
)
|
||||||
|
|
||||||
type step interface {
|
type step interface {
|
||||||
pre() common.Executor
|
pre() common.Executor
|
||||||
main() common.Executor
|
main() common.Executor
|
||||||
@@ -149,10 +154,7 @@ func runStepExecutor(step step, stage stepStage, executor common.Executor) commo
|
|||||||
stateFileCommand := path.Join("workflow", "statecmd.txt")
|
stateFileCommand := path.Join("workflow", "statecmd.txt")
|
||||||
(*step.getEnv())["GITHUB_STATE"] = container.JoinPath(actPath, stateFileCommand)
|
(*step.getEnv())["GITHUB_STATE"] = container.JoinPath(actPath, stateFileCommand)
|
||||||
|
|
||||||
pathFileCommand := path.Join("workflow", "pathcmd.txt")
|
|
||||||
(*step.getEnv())["GITHUB_PATH"] = container.JoinPath(actPath, pathFileCommand)
|
(*step.getEnv())["GITHUB_PATH"] = container.JoinPath(actPath, pathFileCommand)
|
||||||
|
|
||||||
envFileCommand := path.Join("workflow", "envs.txt")
|
|
||||||
(*step.getEnv())["GITHUB_ENV"] = container.JoinPath(actPath, envFileCommand)
|
(*step.getEnv())["GITHUB_ENV"] = container.JoinPath(actPath, envFileCommand)
|
||||||
|
|
||||||
// Per-step summary file. Composite sub-steps share the outer job step's index
|
// Per-step summary file. Composite sub-steps share the outer job step's index
|
||||||
@@ -263,7 +265,7 @@ func setupEnv(ctx context.Context, step step) error {
|
|||||||
|
|
||||||
env := step.getEnv()
|
env := step.getEnv()
|
||||||
// container env is the image's baseline, which job env and $GITHUB_ENV override
|
// container env is the image's baseline, which job env and $GITHUB_ENV override
|
||||||
mergeIntoMap(step, env, rc.caEnv, rc.containerSpec.Env, rc.GetEnv())
|
mergeIntoMap(step, env, rc.defaultEnv, rc.containerSpec.Env, rc.GetEnv())
|
||||||
rc.withGithubEnv(ctx, getStepGithubContext(ctx, step), *env)
|
rc.withGithubEnv(ctx, getStepGithubContext(ctx, step), *env)
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|||||||
+17
-18
@@ -10,7 +10,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"maps"
|
"maps"
|
||||||
"runtime"
|
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -358,29 +357,29 @@ func (sr *stepRun) setupShell(ctx context.Context, eval *expressionEvaluator) (b
|
|||||||
|
|
||||||
implicitShell := step.Shell == ""
|
implicitShell := step.Shell == ""
|
||||||
if implicitShell {
|
if implicitShell {
|
||||||
shellWithFallback := []string{"bash", "sh"}
|
preferred, fallback := "bash", "sh"
|
||||||
|
if rc.isWindowsHost() {
|
||||||
|
preferred, fallback = "pwsh", "powershell" // Don't use bash on windows by default, if not using a docker container
|
||||||
|
}
|
||||||
env := maps.Clone(sr.env)
|
env := maps.Clone(sr.env)
|
||||||
rc.ApplyExtraPath(ctx, &env)
|
rc.ApplyExtraPath(ctx, &env)
|
||||||
if _, ok := rc.JobContainer.(*container.HostEnvironment); ok {
|
step.Shell = rc.shellOrFallback(ctx, env, preferred, fallback)
|
||||||
// Don't use bash on windows by default, if not using a docker container
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
shellWithFallback = []string{"pwsh", "powershell"}
|
|
||||||
}
|
|
||||||
step.Shell = shellWithFallback[0]
|
|
||||||
_, err := lookpath.LookPath2(shellWithFallback[0], env)
|
|
||||||
if err != nil {
|
|
||||||
step.Shell = shellWithFallback[1]
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
step.Shell = shellWithFallback[0]
|
|
||||||
if !rc.containerHasBash(ctx, env) {
|
|
||||||
step.Shell = shellWithFallback[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return implicitShell, nil
|
return implicitShell, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// shellOrFallback probes a container only for bash.
|
||||||
|
func (rc *RunContext) shellOrFallback(ctx context.Context, env map[string]string, preferred, fallback string) string {
|
||||||
|
if _, ok := rc.JobContainer.(*container.HostEnvironment); ok {
|
||||||
|
if _, err := lookpath.LookPath2(preferred, env); err != nil {
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
} else if preferred == "bash" && !rc.containerHasBash(ctx, env) {
|
||||||
|
return fallback
|
||||||
|
}
|
||||||
|
return preferred
|
||||||
|
}
|
||||||
|
|
||||||
// containerHasBash probes once per job, else every implicit-shell step pays for an exec.
|
// containerHasBash probes once per job, else every implicit-shell step pays for an exec.
|
||||||
func (rc *RunContext) containerHasBash(ctx context.Context, env map[string]string) bool {
|
func (rc *RunContext) containerHasBash(ctx context.Context, env map[string]string) bool {
|
||||||
top := rc.topLevelRunContext()
|
top := rc.topLevelRunContext()
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
outputs:
|
||||||
|
output:
|
||||||
|
value: ${{ jobs.first.outputs.output }}
|
||||||
|
dependent:
|
||||||
|
value: ${{ jobs.dependent.outputs.output }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
first:
|
||||||
|
uses: ./.github/workflows/local-reusable-workflow.yml
|
||||||
|
with:
|
||||||
|
string_required: string
|
||||||
|
bool_required: true
|
||||||
|
number_required: 1
|
||||||
|
secrets: inherit
|
||||||
|
dependent:
|
||||||
|
needs: first
|
||||||
|
uses: ./.github/workflows/local-reusable-workflow.yml
|
||||||
|
with:
|
||||||
|
string_required: ${{ needs.first.result == 'success' && needs.first.outputs.output || 'failure' }}
|
||||||
|
bool_required: true
|
||||||
|
number_required: 1
|
||||||
|
secrets: inherit
|
||||||
+7
@@ -21,11 +21,18 @@ jobs:
|
|||||||
number_required: 1
|
number_required: 1
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
|
nested-reusable-workflow:
|
||||||
|
uses: ./.github/workflows/nested-reusable-workflow.yml
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
output-test:
|
output-test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- reusable-workflow
|
- reusable-workflow
|
||||||
- reusable-workflow-with-inherited-secrets
|
- reusable-workflow-with-inherited-secrets
|
||||||
|
- nested-reusable-workflow
|
||||||
steps:
|
steps:
|
||||||
- run: '[[ "${{ needs.reusable-workflow.outputs.output == ''string'' }}" = "true" ]] || exit 1'
|
- run: '[[ "${{ needs.reusable-workflow.outputs.output == ''string'' }}" = "true" ]] || exit 1'
|
||||||
- run: '[[ "${{ needs.reusable-workflow-with-inherited-secrets.outputs.output == ''string'' }}" = "true" ]] || exit 1'
|
- run: '[[ "${{ needs.reusable-workflow-with-inherited-secrets.outputs.output == ''string'' }}" = "true" ]] || exit 1'
|
||||||
|
- run: '[[ "${{ needs.nested-reusable-workflow.outputs.output == ''string'' }}" = "true" ]] || exit 1'
|
||||||
|
- run: '[[ "${{ needs.nested-reusable-workflow.outputs.dependent == ''string'' }}" = "true" ]] || exit 1'
|
||||||
+1
-1
@@ -12,7 +12,7 @@ steps:
|
|||||||
|
|
||||||
- Set the `RUNNER_TRACKING_ID` override in the step's `env` before it starts. Any value different from the job's ID opts out, including an empty string. On Linux and macOS a script can also set it before starting a process.
|
- Set the `RUNNER_TRACKING_ID` override in the step's `env` before it starts. Any value different from the job's ID opts out, including an empty string. On Linux and macOS a script can also set it before starting a process.
|
||||||
- Opted-out processes and descendants that inherit the override survive normal job cleanup and expired output waits. Detach helper output because the runner closes leftover output pipes after a bounded wait.
|
- Opted-out processes and descendants that inherit the override survive normal job cleanup and expired output waits. Detach helper output because the runner closes leftover output pipes after a bounded wait.
|
||||||
- Cancelling or timing out an active step still terminates its process tree.
|
- Cancelling or timing out an active step still terminates its process tree, on Unix with SIGINT, then SIGTERM after 7.5 seconds and SIGKILL after 2.5 more.
|
||||||
- The override does not preserve workspace or temporary files. Store persistent helper files outside those directories and arrange the helper's eventual shutdown.
|
- The override does not preserve workspace or temporary files. Store persistent helper files outside those directories and arrange the helper's eventual shutdown.
|
||||||
|
|
||||||
This follows [actions/runner's tracking ID and orphan cleanup](https://github.com/actions/runner/blob/main/src/Runner.Worker/JobExtension.cs). Container jobs follow their container's lifecycle.
|
This follows [actions/runner's tracking ID and orphan cleanup](https://github.com/actions/runner/blob/main/src/Runner.Worker/JobExtension.cs). Container jobs follow their container's lifecycle.
|
||||||
+2
-2
@@ -28,8 +28,8 @@ The script is run according to its extension:
|
|||||||
|
|
||||||
| Extension | Command |
|
| Extension | Command |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| `.sh` | `bash -e <path>` |
|
| `.sh` | `bash -e <path>`, or `sh -e <path>` without bash |
|
||||||
| `.ps1` | `pwsh -command . '<path>'` |
|
| `.ps1` | `pwsh -command . '<path>'`, or `powershell` on a host without pwsh |
|
||||||
| anything else | the file itself, which needs its own shebang and executable bit |
|
| anything else | the file itself, which needs its own shebang and executable bit |
|
||||||
|
|
||||||
As on GitHub, the shell flags applied to `run:` steps are **not** applied to a hook — set `pipefail` or anything else you want inside the script.
|
As on GitHub, the shell flags applied to `run:` steps are **not** applied to a hook — set `pipefail` or anything else you want inside the script.
|
||||||
|
|||||||
Loaded 50 of 70 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user