yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: re-implement embed without "unused" import (#830)

Browse source 
* refactor: re-implement `embed` without "unused" import

* fix(gitignore): ignore local docker registry data
This commit is contained in:
Ryan 2021-09-27 17:33:14 +00:00 committed by GitHub
parent bfcf0abd73
commit 7a426a0f37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -28,3 +28,6 @@ coverage.txt
.env .env
.secrets .secrets
# ignore docker registry from .github/workflows/checks.yml
docker-registry/

14
pkg/runner/step_context.go
View file

@ -3,11 +3,9 @@ package runner
import ( import (
"archive/tar" "archive/tar"
"context" "context"
"io" "embed"
// Go told me to?
_ "embed"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
@ -335,7 +333,7 @@ func (sc *StepContext) runUsesContainer() common.Executor {
} }
//go:embed res/trampoline.js //go:embed res/trampoline.js
var trampoline []byte var trampoline embed.FS
func (sc *StepContext) setupAction(actionDir string, actionPath string, localAction bool) common.Executor { func (sc *StepContext) setupAction(actionDir string, actionPath string, localAction bool) common.Executor {
return func(ctx context.Context) error { return func(ctx context.Context) error {
@ -378,7 +376,11 @@ func (sc *StepContext) setupAction(actionDir string, actionPath string, localAct
} }
if sc.Step.With != nil { if sc.Step.With != nil {
if val, ok := sc.Step.With["args"]; ok { if val, ok := sc.Step.With["args"]; ok {
err2 := ioutil.WriteFile(filepath.Join(actionDir, actionPath, "trampoline.js"), trampoline, 0400) var b []byte
if b, err = trampoline.ReadFile("res/trampoline.js"); err != nil {
return err
}
err2 := ioutil.WriteFile(filepath.Join(actionDir, actionPath, "trampoline.js"), b, 0400)
if err2 != nil { if err2 != nil {
return err return err
} }