From 019b56891dab2e9693da1b7692dfd83301274f60 Mon Sep 17 00:00:00 2001 From: Tom Chauveau Date: Wed, 1 Sep 2021 18:40:02 +0200 Subject: [PATCH] Update old git test Signed-off-by: Tom Chauveau --- stdlib/.dagger/env/{git => git-repo}/.gitignore | 0 stdlib/.dagger/env/{git => git-repo}/values.yaml | 8 ++++---- stdlib/git/tests/{ => git}/git.cue | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) rename stdlib/.dagger/env/{git => git-repo}/.gitignore (100%) rename stdlib/.dagger/env/{git => git-repo}/values.yaml (70%) rename stdlib/git/tests/{ => git}/git.cue (90%) diff --git a/stdlib/.dagger/env/git/.gitignore b/stdlib/.dagger/env/git-repo/.gitignore similarity index 100% rename from stdlib/.dagger/env/git/.gitignore rename to stdlib/.dagger/env/git-repo/.gitignore diff --git a/stdlib/.dagger/env/git/values.yaml b/stdlib/.dagger/env/git-repo/values.yaml similarity index 70% rename from stdlib/.dagger/env/git/values.yaml rename to stdlib/.dagger/env/git-repo/values.yaml index 164b56f2..c07ef0da 100644 --- a/stdlib/.dagger/env/git/values.yaml +++ b/stdlib/.dagger/env/git-repo/values.yaml @@ -1,6 +1,6 @@ plan: - package: ./git/tests -name: git + package: ./git/tests/git +name: git-repo inputs: TestPAT: secret: ENC[AES256_GCM,data:7s1tSIpIDNBhAFupdjb7KtPbjKrCd5tXupr3RQF2N3Xu5XGuTZMgoQ==,iv:I+SVYLnjgMffvNg6BMB6m1lj+VVH5sDK0aIEAWPcyLY=,tag:TcfJ6LVps8dXVZGZy3T2ew==,type:str] @@ -19,8 +19,8 @@ sops: TmhJNisyamw3d244aGVJSEVFVUVLZGsKvd+nowA0CLXQbdvyI4J0lBjs9vdISWlo gGvR49uul3Z8raVWXFUzsyQ8xTvYNg0ovynFG2KdagSKr1DlhKMBEQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2021-08-26T13:44:11Z" - mac: ENC[AES256_GCM,data:ttmpbzhrVFEGh/oJF4TtMvf99rutPBbzp9cIaqakIl+5nxqOkuAakgvf7IIMBG235zdyMvIXZZh6NLYG51PZA1hKNMg5Pqqba9GOSvFCHasWzNJ3pi5SLBGD02ivDfkSMbEHeOCUhnG1X4LxkYL9j+fb4tQt1Btv1hiIAcIa+eY=,iv:WxuW+0yJYtNqAB0y1nji9c3lzn4Pftir8uZojcdphng=,tag:yvcIJxkuqOmCfXoyEnGWow==,type:str] + lastmodified: "2021-09-01T08:40:49Z" + mac: ENC[AES256_GCM,data:UgryTszQf7YgFfXL8YhzJekPIOymtd8adyijOp6AQW8JGXu989JtlXeUKvLpRkbyjZD8+oTTX1iK7Ssj/hJKgo0yklLc7O9sSQGhxjo/3WYTcKUcHd5Tj9yoZp+RFH1qZxpnkAexZoM2rwOT9FAhdV3/AJV2ekY2Qe3JbrGJr6s=,iv:DXiIE1oNDPGhXcL2aPXA2TcvY6Jee4mFypq3bELnAx4=,tag:qfHMnpGr6yFLSQHqIvyglA==,type:str] pgp: [] encrypted_suffix: secret version: 3.7.1 diff --git a/stdlib/git/tests/git.cue b/stdlib/git/tests/git/git.cue similarity index 90% rename from stdlib/git/tests/git.cue rename to stdlib/git/tests/git/git.cue index 3f00ca4b..ca7a675c 100644 --- a/stdlib/git/tests/git.cue +++ b/stdlib/git/tests/git/git.cue @@ -5,28 +5,27 @@ import ( "alpha.dagger.io/alpine" "alpha.dagger.io/dagger" - "alpha.dagger.io/git" "alpha.dagger.io/os" ) -repo: git.#Repository & { +repo: #Repository & { remote: "https://github.com/blocklayerhq/acme-clothing.git" ref: "master" keepGitDir: true } -repoSubDir: git.#Repository & { +repoSubDir: #Repository & { remote: "https://github.com/dagger/examples.git" ref: "main" subdir: "todoapp" keepGitDir: true } -branch: git.#CurrentBranch & { +branch: #CurrentBranch & { repository: repo } -tagsList: git.#Tags & { +tagsList: #Tags & { repository: repo } @@ -79,7 +78,7 @@ TestCurrentTags: os.#Container & { // Test fetching a private repo TestPAT: dagger.#Input & {dagger.#Secret} -privateRepo: git.#Repository & { +privateRepo: #Repository & { remote: "https://github.com/dagger/dagger.git" ref: "main" keepGitDir: true