# HG changeset patch # User Edouard Tisserant # Date 1660509952 -7200 # Node ID 0623d6d4616b243b32c3164f8d9a8831d778a628 # Parent 54c0e2662dd3eb349cde5119f769a54b1eaf1d6c GH CD: chechout all projects, even self from prep_sources.yml so that revisions.txt is not too old for Makefile. diff -r 54c0e2662dd3 -r 0623d6d4616b .github/workflows/build_bundles.yml --- a/.github/workflows/build_bundles.yml Sun Aug 14 19:15:04 2022 +0200 +++ b/.github/workflows/build_bundles.yml Sun Aug 14 22:45:52 2022 +0200 @@ -14,9 +14,6 @@ runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - with: - path: beremiz_public_dist - name: Download source artifact uses: actions/download-artifact@v3 @@ -24,7 +21,7 @@ name: source_package - name: untar files - run: tar -xvf build.tar + run: tar -xvf sources.tar - name: Cache docker image id: cache-docker diff -r 54c0e2662dd3 -r 0623d6d4616b .github/workflows/build_snap.yml --- a/.github/workflows/build_snap.yml Sun Aug 14 19:15:04 2022 +0200 +++ b/.github/workflows/build_snap.yml Sun Aug 14 22:45:52 2022 +0200 @@ -14,11 +14,6 @@ runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - with: - # checkout directly in build/sources so that - # sources dirs are aside snap dir - path: beremiz_public_dist - name: Download source artifact uses: actions/download-artifact@v3 @@ -26,7 +21,7 @@ name: source_package - name: untar files - run: tar -xvf build.tar + run: tar -xvf sources.tar - name: Move snap dir and revisions.txt in build/sources run: | diff -r 54c0e2662dd3 -r 0623d6d4616b .github/workflows/prep_sources.yml --- a/.github/workflows/prep_sources.yml Sun Aug 14 19:15:04 2022 +0200 +++ b/.github/workflows/prep_sources.yml Sun Aug 14 22:45:52 2022 +0200 @@ -17,6 +17,10 @@ steps: + - uses: actions/checkout@v3 + with: + path: beremiz_public_dist + # repositories are directly checked out where Makerfile expects them to be - uses: actions/checkout@v3 with: @@ -71,10 +75,10 @@ EOF - name: Tar files - run: tar -cvf build.tar build + run: tar -cvf sources.tar . - name: Upload source artifact uses: actions/upload-artifact@v3 with: name: source_package - path: build.tar + path: sources.tar