Skip to content

Commit

Permalink
Update paths in dagger pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
sevein committed Aug 16, 2024
1 parent 920ae3b commit 83944e8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .dagger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Other modes available are: `USE_CACHED` (rely on existing state) and

The e2e tests load existing SQL dumps by default, but you can update them with:

dagger call --source=".:default" generate-dumps export --path=hack/ccp/e2e/testdata/dumps
dagger call --source=".:default" generate-dumps export --path=e2e/testdata/dumps

## Troubleshooting

Expand Down
4 changes: 2 additions & 2 deletions .dagger/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ type Build struct {

func (m *Build) WorkerImage() *dagger.Container {
return m.Source.DockerBuild(dagger.DirectoryDockerBuildOpts{
Dockerfile: "hack/Dockerfile",
Dockerfile: "Dockerfile",
Target: "archivematica-worker",
})
}

func (m *Build) CCPImage() *dagger.Container {
return m.Source.DockerBuild(dagger.DirectoryDockerBuildOpts{
Dockerfile: "hack/Dockerfile",
Dockerfile: "Dockerfile",
Target: "archivematica-ccp",
})
}
Expand Down
4 changes: 2 additions & 2 deletions .dagger/etoe.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

const (
dbName = "CCP"
dbDumpsDir = "hack/ccp/e2e/testdata/dumps"
dbDumpsDir = "e2e/testdata/dumps"
)

// Options for the shared Archivematica directory that we provisiong using
Expand Down Expand Up @@ -84,7 +84,7 @@ func (m *CCP) Etoe(

dag.Go(dagger.GoOpts{
Container: goModule().
WithSource(m.Source.Directory("hack/ccp")).
WithSource(m.Source).
Container().
WithServiceBinding("mysql", mysql).
WithServiceBinding("ccp", ccp).
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
args: [--no-ensure-ascii, --autofix]
files: |
(?x)^(
hack/ccp/internal/workflow/assets/.*\.json|
internal/workflow/assets/.*\.json|
worker/install/.*\.json
)
- repo: https://github.com/astral-sh/ruff-pre-commit
Expand Down

0 comments on commit 83944e8

Please sign in to comment.