Skip to content

Commit f0ddfe8

Browse files
authored
Update main.yml
1 parent fb279b6 commit f0ddfe8

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232
restore-keys: |
3333
buildkit-${{ runner.os }}-
3434
35-
- name: Restore BuildKit daemon Cache
35+
- name: Restore Daemon Cache
3636
uses: actions/cache/restore@v4
37-
id: restore-buildkitd-cache
37+
id: restore-droot-cache
3838
with:
3939
path: |
40-
buildkitd
41-
key: buildkitd-${{ runner.os }}-
40+
droot
41+
key: droot-${{ runner.os }}-
4242
restore-keys: |
43-
buildkitd-${{ runner.os }}-
43+
droot-${{ runner.os }}-
4444
4545
- name: Log in to Container Registry
4646
uses: docker/login-action@v3
@@ -98,15 +98,16 @@ jobs:
9898
9999
$logs = "buildkit/logs"
100100
$cni = "${{ github.workspace }}\buildkit\cni"
101-
$droot = "${{ github.workspace }}\buildkitd\root"
101+
$droot = "${{ github.workspace }}\droot"
102102
103103
Start-Job -ScriptBlock {
104-
param($logs)
104+
param($logs, $droot)
105105
Start-Process containerd.exe `
106+
-ArgumentList @("--root=$droot\containerd") `
106107
-RedirectStandardOutput "$logs/containerd.log" `
107108
-RedirectStandardError "$logs/containerd_error.log" `
108109
-NoNewWindow -PassThru
109-
} -ArgumentList $logs
110+
} -ArgumentList $logs, $droot
110111
111112
Wait-For "ctr --namespace buildkit image ls"
112113
@@ -115,7 +116,7 @@ jobs:
115116
Start-Process buildkitd.exe `
116117
-ArgumentList @("--containerd-cni-config-path=$cni\0-containerd-nat.conf",
117118
"--containerd-cni-binary-dir=$cni", `
118-
"--root=$droot") `
119+
"--root=$droot\buildkitd") `
119120
-RedirectStandardOutput "$logs/buildkitd.log" `
120121
-RedirectStandardError "$logs/buildkitd_error.log" `
121122
-NoNewWindow -PassThru
@@ -181,10 +182,10 @@ jobs:
181182
buildkit
182183
key: buildkit-${{ runner.os }}-
183184

184-
- name: Save BuildKit daemon Cache
185-
id: save-buildkitd-cache
185+
- name: Save Daemon Cache
186+
id: save-droot-cache
186187
uses: actions/cache/save@v4
187188
with:
188189
path: |
189-
buildkitd
190-
key: buildkitd-${{ runner.os }}-
190+
droot
191+
key: droot-${{ runner.os }}-

0 commit comments

Comments
 (0)