Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: docker stub and add a test for this #2355

Merged
merged 4 commits into from
Jul 10, 2024
Merged

fix: docker stub and add a test for this #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bbc66c
fix: docker stub
ChristopherHX Jun 5, 2024
beb8d01
test if you can build run without docker
ChristopherHX Jun 6, 2024
76fb752
Merge branch 'master' into fix-docker-stub
mergify[bot] Jul 10, 2024
9deb39c
Merge branch 'master' into fix-docker-stub
ChristopherHX Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
upload-logs-name: logs-linux
- name: Run act from cli
run: go run main.go -P ubuntu-latest=node:16-buster-slim -C ./pkg/runner/testdata/ -W ./basic/push.yml
- name: Run act from cli without docker support
run: go run -tags WITHOUT_DOCKER main.go -P ubuntu-latest=-self-hosted -C ./pkg/runner/testdata/ -W ./local-action-js/push.yml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm building act as dependency of platforms using docker_stub, so noticed it stopped compiling after merging

- name: Upload Codecov report
uses: codecov/codecov-action@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions pkg/container/docker_stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"runtime"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/system"
"github.com/nektos/act/pkg/common"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -46,8 +46,8 @@ func RunnerArch(ctx context.Context) string {
return runtime.GOOS
}

func GetHostInfo(ctx context.Context) (info types.Info, err error) {
return types.Info{}, nil
func GetHostInfo(ctx context.Context) (info system.Info, err error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was probably a docker api update, that affected undetected files

return system.Info{}, nil
}

func NewDockerVolumeRemoveExecutor(volume string, force bool) common.Executor {
Expand Down
Loading