diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7963e7d3..76b32427 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,24 +12,22 @@ env: CARGO_TERM_COLOR: always jobs: - buildTestAyaDirect: - uses: melodium-tech/github-actions/.github/workflows/melodium-ubuntu.yml@v0.9.1 + #buildTestAyaDirect: + # uses: melodium-tech/github-actions/.github/workflows/melodium-ubuntu.yml@v0.9.1 + # with: + # command: | + # run .melodium-ci/Compo.toml buildTestAyaDirect --github_contexts='$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' + # artifact-path: 'logs/' + # secrets: + # token: ${{ secrets.GITHUB_TOKEN }} + buildTestAya: + uses: melodium-tech/github-actions/.github/workflows/melodium-local-distrib.yml@v0.9.1 with: command: | - run .melodium-ci/Compo.toml buildTestAyaDirect --github_contexts='$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' + run .melodium-ci/Compo.toml buildTestAya --repository_clone_url='"${{ github.repositoryUrl }}"' --repository_clone_ref='"${{ github.ref_name }}"' --github_contexts='$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' artifact-path: 'logs/' secrets: token: ${{ secrets.GITHUB_TOKEN }} - #buildTestAya: - #uses: melodium-tech/github-actions/.github/workflows/melodium-local-distrib.yml@v0.9.0 - #with: - # version: 0.9.1 - # command: | - # run .melodium-ci/Compo.toml buildTestAya --repository_clone_url='"${{ github.repositoryUrl }}"' --repository_clone_ref='"${{ github.ref_name }}"' --github_contexts='$''{{{{ { "github": ${{ toJSON(github) }}, "vars": ${{ toJSON(vars) }}, "secrets": { "GITHUB_TOKEN": "'"$GITHUB_TOKEN"'" } } }}}}' - # artifact-path: 'logs/' - # melodium_images_pull_source: registry.gitlab.com/melodium/containers - #secrets: - # token: ${{ secrets.GITHUB_TOKEN }} #runs-on: ubuntu-latest #steps: # - uses: actions/checkout@v5 diff --git a/.melodium-ci/lib-root.mel b/.melodium-ci/lib-root.mel index 12873ae0..ed294ea6 100644 --- a/.melodium-ci/lib-root.mel +++ b/.melodium-ci/lib-root.mel @@ -48,14 +48,14 @@ treatment buildTestAya(const github_contexts: string = "{}", repository_clone_ur repository_clone_ref=repository_clone_ref, repository_clone_url=repository_clone_url ) - /*build_armv7: buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( + build_armv7: buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( short_rust_arch="armv7", full_rust_arch="armv7-unknown-linux-gnueabi", ubuntu_arch="armhf", repository_clone_ref=repository_clone_ref, repository_clone_url=repository_clone_url ) - build_powerpc64le: buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( + /*build_powerpc64le: buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( short_rust_arch="powerpc64le", full_rust_arch="powerpc64le-unknown-linux-gnu", ubuntu_arch="ppc64le", @@ -85,8 +85,8 @@ treatment buildTestAya(const github_contexts: string = "{}", repository_clone_ur )*/ prepareContexts.ready -> build_aarch64.trigger - /*prepareContexts.ready -> build_armv7.trigger - prepareContexts.ready -> build_powerpc64le.trigger + prepareContexts.ready -> build_armv7.trigger + /*prepareContexts.ready -> build_powerpc64le.trigger prepareContexts.ready -> build_riscv64gc.trigger prepareContexts.ready -> build_s390x.trigger prepareContexts.ready -> build_x86_64.trigger*/