kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

rebase merge conflicts fix

Browse Source 
Signed-off-by: Guillaume de Rouville <guillaume.derouville@gmail.com>
This commit is contained in:
Guillaume de Rouville 2021-09-01 12:14:57 +02:00
parent 99d2494033
commit 3453675a3f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/learn/tests/.dagger/env/cloudformation/values.yaml vendored
View File

@ -5,7 +5,7 @@ inputs:
awsConfig.accessKey: awsConfig.accessKey:
secret: ENC[AES256_GCM,data:HaGzSQ==,iv:FzsuSq7ZKttWs0WDC0q+vT/hxUx+WcQ4iy7vnV+Q8Dg=,tag:Oy9Xxq+4LMVkXkF/3ZjjsA==,type:str] secret: ENC[AES256_GCM,data:HaGzSQ==,iv:FzsuSq7ZKttWs0WDC0q+vT/hxUx+WcQ4iy7vnV+Q8Dg=,tag:Oy9Xxq+4LMVkXkF/3ZjjsA==,type:str]
awsConfig.localMode: awsConfig.localMode:
text: "true" bool: "true"
awsConfig.region: awsConfig.region:
text: us-east-2 text: us-east-2
awsConfig.secretKey: awsConfig.secretKey:
@ -27,8 +27,8 @@ sops:
Lzd0bU1qMXF0dzIzTG05cmlzZURxUncKp2wNXD/HKXgGv16pM/yvaYfWL5lsQyWo Lzd0bU1qMXF0dzIzTG05cmlzZURxUncKp2wNXD/HKXgGv16pM/yvaYfWL5lsQyWo
CDsT4rHHMZ21XtS9W+7oL9IqMMmDUQf6RZgDgoqLVmTjdBeA8yB2yg== CDsT4rHHMZ21XtS9W+7oL9IqMMmDUQf6RZgDgoqLVmTjdBeA8yB2yg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2021-08-20T13:10:08Z" lastmodified: "2021-09-01T09:50:18Z"
mac: ENC[AES256_GCM,data:UIhYTG5ofk04dPLOaYiryOt/JC+8/ousZlGpotAAenHOYVo0FChYKywofquOVlpqdC0a/wT6eEz59ofpxDuzV/8/Qh/5MumHqfJUYtQezQYVhreLpWdLsHTn99Ndqjzhj+on9ODumqsAOM+PgVEKRTxSHtTOZB8i4gfO77hg5nk=,iv:E11iRe9z+PxHCy9qtnEYVv+uXVxn1CfAqIgGspd5ObM=,tag:PzORtWy+xVwXof5nbHrDDw==,type:str] mac: ENC[AES256_GCM,data:UsQxbxNq5wTpXIcw2V/LAQxiavwVcJxACSOGO/AWWrpamemOFqrjwHXQ0CfXGTEq16Vw/YnE3W+ivfxhlPQunkzUsxpvAsKexmx1/uDf04cmGQQFHownV8VO/YmKFmo5UKa6V2cEhDXT040iJncRwp8rrJ2nbRBDKd36RBWtIO0=,iv:QEF3brbSZsDAPyTfPRhyv440EtVKlDq1m0bFCBU0Aj8=,tag:RRCQciN3ho7ChAQ5HhTgIA==,type:str]
pgp: [] pgp: []
encrypted_suffix: secret encrypted_suffix: secret
version: 3.7.1 version: 3.7.1

7
stdlib/universe.bats
View File

@ -11,13 +11,6 @@ setup() {
common_setup common_setup
} }
# Instead of setup, this just runs once
setup_file() {
load 'helpers'
cleanup_localstack
}
@test "cue-sanity-check" { @test "cue-sanity-check" {
dagger -e sanity-check up dagger -e sanity-check up
} }