diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e3aed8..226d6c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: matrix: version: - latest - - 0.1.0-alpha.17 + - 0.1.0-alpha.31 steps: - name: Checkout diff --git a/dist/index.js b/dist/index.js index 9247147..123f19b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -217,7 +217,7 @@ function run() { process.chdir(inputs.workdir); } stateHelper.setCleanup(inputs.cleanup); - yield exec.exec(`${daggerBin} ${inputs.args} --log-format pretty`); + yield exec.exec(`${daggerBin} ${inputs.args} --log-format plain`); } catch (error) { core.setFailed(error.message); diff --git a/src/main.ts b/src/main.ts index 43831fc..d3f2f4a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -36,7 +36,7 @@ async function run(): Promise { } stateHelper.setCleanup(inputs.cleanup); - await exec.exec(`${daggerBin} ${inputs.args} --log-format pretty`); + await exec.exec(`${daggerBin} ${inputs.args} --log-format plain`); } catch (error) { core.setFailed(error.message); } diff --git a/test/.dagger/env/staging/.gitignore b/test/.dagger/env/ci/.gitignore similarity index 100% rename from test/.dagger/env/staging/.gitignore rename to test/.dagger/env/ci/.gitignore diff --git a/test/.dagger/env/ci/values.yaml b/test/.dagger/env/ci/values.yaml new file mode 100644 index 0000000..e62198f --- /dev/null +++ b/test/.dagger/env/ci/values.yaml @@ -0,0 +1,23 @@ +plan: + package: ./ci +name: ci +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1ldpnwlxnru3vpgnjvfny8g54jeweps6msv8hyckwcj3faju4g4psrwr37a + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlMmU1TnA3RnVsMkF1SlNK + emRlVWtCekt2RUFONCtHQmpTU1YxR0JwVms0CmswdnBHOEpUS0VMKzBsTnZCT0Zs + ZXdwMjZ5UG1YRHNZQlUyVlZjdjN1RVUKLS0tIGFnWDVvdktXeGFOVlAyNjRmUUho + MmU1ZGFZdjlwMWoyc1hFTmxFK1VJaUkKgD6taGx1K6EQ5zzVFBciI2NCB3FO14xz + oGI07dXeKmbvjk12583bWlfq15m+UW7fXvRAnlDXtVedUT+NHYsTRw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2021-12-16T02:10:09Z" + mac: ENC[AES256_GCM,data:9ThHhDDQxp3Ovkr47irlxWaCpwNGkoPjAjJj9/pJA+8GycwY7HMb6YCe0aUdDP8ij6Gx2SRkfUmYYca/vPo1/evBRzSyAz2kg0LKyBkAlpIshxv0mAjixaF1blXWRm/V4+xe9MAm8Qhr3vdNatzmKBwQoBj951UapAfQKnFjHHg=,iv:slbXkJ9ZpJtTGvZp6Ewoe+xSAfoHSNm7Ps3eHnOAVDk=,tag:8HhdnyNmglVaIVp5wCZgvw==,type:str] + pgp: [] + encrypted_suffix: secret + version: 3.7.1 diff --git a/test/.dagger/env/staging/plan/build.cue b/test/.dagger/env/staging/plan/build.cue deleted file mode 100644 index 7c45966..0000000 --- a/test/.dagger/env/staging/plan/build.cue +++ /dev/null @@ -1,17 +0,0 @@ -package main - -import ( - "alpha.dagger.io/docker" - "alpha.dagger.io/git" -) - -// Relay for fetching a git repository -repo: git.#Repository & { - remote: "https://github.com/crazy-max/docker-fail2ban" - ref: "master" -} - -// Relay for building a docker image -ctr: docker.#Build & { - source: repo -} diff --git a/test/.dagger/env/staging/plan/cue.mod/pkg/.gitignore b/test/.dagger/env/staging/plan/cue.mod/pkg/.gitignore deleted file mode 100644 index a572e9e..0000000 --- a/test/.dagger/env/staging/plan/cue.mod/pkg/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# dagger universe -alpha.dagger.io diff --git a/test/.dagger/env/staging/values.yaml b/test/.dagger/env/staging/values.yaml deleted file mode 100644 index 499b301..0000000 --- a/test/.dagger/env/staging/values.yaml +++ /dev/null @@ -1,23 +0,0 @@ -plan: - module: .dagger/env/staging/plan -name: staging -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1ldpnwlxnru3vpgnjvfny8g54jeweps6msv8hyckwcj3faju4g4psrwr37a - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5OVN1b3g3V1l5NytJSDRj - UTNPTDM1ei81cWtqdmh6RXljK1VhRWxnUG1FCjYrUzBlYmRkeGhQR1dERnJCVGtK - WTlhMk8wNnVmbUo1cVlzcmJkV3lZR1EKLS0tIFgrZXBFWVNmMVA3b1N5VlZGQzBU - UEdWcXQ2SW0xY01aanI1Yk1UTEZRdjgKfjibyF28JAblL9QtldQ3XHQ8ddHhVm9o - Q0DY34QpP1Pa8RMd9qg3/WHIQcVcC328VX+JoiOB+CCLyjrX0pyPnw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2021-06-28T17:13:50Z" - mac: ENC[AES256_GCM,data:oDMVw6N8dN3l69RODf9OlbwGsVzTe9sTZ0DBOsXlM22xRACub6NnMrOsru23dffYKnLX6J44gPd9XNK4YhwUobPpmcjJtRmnwKtnE2TiOxlhWMr+xI7j7anJgeMLfAO+1Dk/SVJcRoycv43K0thiaasVDJjorqy/nz+lkP7MeTU=,iv:oHZdLMNNLyxd+psdOUPzjJjpQ8/u2TX+IMKqq0G4a9c=,tag:n3xXv3brzQxp6QdfdEA6aA==,type:str] - pgp: [] - encrypted_suffix: secret - version: 3.7.1 diff --git a/test/README.md b/test/README.md new file mode 100644 index 0000000..27989ee --- /dev/null +++ b/test/README.md @@ -0,0 +1,8 @@ +```console +dagger init +cp ~/.config/dagger/keys.txt . +dagger new ci -p ./ci +mkdir -p ./ci +dagger query +dagger up --no-cache --log-format plain +``` diff --git a/test/ci/main.cue b/test/ci/main.cue new file mode 100644 index 0000000..b2c0198 --- /dev/null +++ b/test/ci/main.cue @@ -0,0 +1,14 @@ +package main + +import ( + "alpha.dagger.io/docker" + "alpha.dagger.io/git" +) + +ctr: docker.#Build & { + source: git.#Repository & { + remote: "https://github.com/crazy-max/docker-fail2ban.git" + ref: "refs/tags/0.11.2-r3" + keepGitDir: true + } +} diff --git a/test/.dagger/env/staging/plan/cue.mod/module.cue b/test/cue.mod/module.cue similarity index 100% rename from test/.dagger/env/staging/plan/cue.mod/module.cue rename to test/cue.mod/module.cue diff --git a/test/cue.mod/pkg/.gitignore b/test/cue.mod/pkg/.gitignore new file mode 100644 index 0000000..2d4dc1a --- /dev/null +++ b/test/cue.mod/pkg/.gitignore @@ -0,0 +1,3 @@ +# generated by dagger +alpha.dagger.io +dagger.lock