diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6cacb43..e9c208f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,15 @@ env: jobs: ciUbuntuLatest: - uses: melodium-tech/github-actions/.github/workflows/melodium-ubuntu.yml@v0.9.0 - with: - version: 0.9.0 - command: | - run .melodium-ci/Compo.toml buildTestAya --logs_directory '"logs/"' --github_contexts '$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' - artifact-path: logs/ - secrets: - token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file + runs-on: ubuntu-latest + steps: + - run: | + .melodium-ci/melodium run .melodium-ci/Compo.toml buildTestAya --logs_directory '"logs/"' --github_contexts '$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' + # uses: melodium-tech/github-actions/.github/workflows/melodium-ubuntu.yml@v0.9.0 + # with: + # version: 0.9.0 + # command: | + # run .melodium-ci/Compo.toml buildTestAya --logs_directory '"logs/"' --github_contexts '$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' + # artifact-path: logs/ + # secrets: + # token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/.melodium-ci/github/ci.mel b/.melodium-ci/github/ci.mel index f765f1f6..ecfebbe0 100644 --- a/.melodium-ci/github/ci.mel +++ b/.melodium-ci/github/ci.mel @@ -171,6 +171,7 @@ cargo hack test --doc --feature-powerset \ jobResult.finished -> step2.post_trigger } +/* #[generated(true)] #[job(buildTestAyaEbpf)] treatment buildTestAyaEbpf[logger: Logger]( @@ -472,13 +473,11 @@ rm -rf test/.tmp/boot test/.tmp/lib ) extractDebianKernels: runAction[contexts = contexts, logger = logger]( commands = ${{set -euxo pipefail -# The wildcard '**/boot/*' extracts kernel images and config. -# The wildcard '**/modules/*' extracts kernel modules. # Modules are required since not all parts of the kernel we want to # test are built-in. find test/.tmp -name '*.deb' -print0 | xargs -t -0 -I {} \ sh -c "dpkg --fsys-tarfile {} | tar -C test/.tmp \ - --wildcards --extract '**/boot/*' '**/modules/*' --file -" + --wildcards --extract '** /boot/ *' '** /modules/ *' --file -" }}, display_name = "Extract debian kernels", name = "extractDebianKernels" @@ -617,3 +616,4 @@ cargo xtask integration-test vm --cache-dir test/.tmp \ jobResult.finished -> step8.post_trigger } +*/ \ No newline at end of file diff --git a/.melodium-ci/github/gen.mel b/.melodium-ci/github/gen.mel index c0f7a953..0ee73b1f 100644 --- a/.melodium-ci/github/gen.mel +++ b/.melodium-ci/github/gen.mel @@ -10,7 +10,7 @@ use json/value::|null use json::Json use log/logger::Logger use std/data/string_map::|map - +/* #[job(codegen)] #[generated(true)] treatment codegen[logger: Logger]( @@ -97,3 +97,4 @@ libbpf commit: ${{ steps.libbpf.outputs.sha }} jobResult.finished -> step2.post_trigger } +*/ \ No newline at end of file diff --git a/.melodium-ci/melodium b/.melodium-ci/melodium new file mode 100755 index 00000000..5d80e94b Binary files /dev/null and b/.melodium-ci/melodium differ diff --git a/.melodium-ci/workflows.mel b/.melodium-ci/workflows.mel index 2cdb7dcd..00ad086d 100644 --- a/.melodium-ci/workflows.mel +++ b/.melodium-ci/workflows.mel @@ -1,10 +1,10 @@ use root/github/ci::buildTestAyaAll -use root/github/ci::buildTestAya +/*use root/github/ci::buildTestAya use root/github/ci::buildTestAyaEbpf use root/github/ci::buildWorkflowComplete use root/github/ci::lint use root/github/ci::runIntegrationTest -use root/github/gen::codegen +use root/github/gen::codegen*/ use cicd/logging::manageLogs use json/value::|null use json::Json @@ -233,6 +233,7 @@ treatment cimatrixOsEntrypoint( } */ +/* #[github_workflow(/.github/workflows/gen.yml)] #[generated(true)] treatment gen[logger: Logger]( @@ -274,3 +275,4 @@ treatment genEntrypoint( gen.finished -> manageLogs.stop } +*/ \ No newline at end of file