Skip to content

Drop the polyfill for the engine's findConfigDirs #2

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

Draft
grouville wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Drop the polyfill for the engine's findConfigDirs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions compose.dang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ type Compose {
prefix marks an enclosing project.
"""
pub projects(ws: Workspace!): [ComposeProject!]! {
polyfill
.workspace(ws)
ws
.findConfigDirs(configNames)
.map { projectPath =>
ComposeProject(path: projectPath, composeImage: composeImage, configNames: configNames)
Expand All @@ -49,7 +48,7 @@ type Compose {
"""
let relativeToCwd(ws: Workspace!, filePath: String!): String! {
let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1)
let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment =>
let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment =>
segment != "" and segment != "."
}
# Longest common prefix: acc only advances while every prior segment matched.
Expand Down
9 changes: 2 additions & 7 deletions dagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
{
"name": "docker",
"engineVersion": "v0.20.6",
"engineVersion": "v1.0.0-beta.10",
"sdk": {
"source": "dang"
},
"dependencies": [
{
"name": "polyfill",
"source": "github.com/dagger/polyfill@main",
"pin": "ec3ea84a2351b4beb06ecece951f2e5ef66509ff"
},
{
"name": "proxy",
"source": "./proxy"
}
]
}
}
5 changes: 2 additions & 3 deletions docker.dang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ type Docker {
marks an enclosing project.
"""
pub projects(ws: Workspace!): [DockerProject!]! {
polyfill
.workspace(ws)
ws
.findConfigDirs(["Dockerfile"])
.map { projectPath =>
DockerProject(path: projectPath, lintImage: lintImage)
Expand Down Expand Up @@ -53,7 +52,7 @@ type Docker {
"""
let relativeToCwd(ws: Workspace!, filePath: String!): String! {
let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1)
let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment =>
let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment =>
segment != "" and segment != "."
}
# Longest common prefix: acc only advances while every prior segment matched.
Expand Down