diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 53d0f4d..91cf0ef 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -10,30 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: wait for rootfs build to finish - uses: lewagon/wait-on-check-action@v1.3.3 - with: - ref: ${{ github.ref }} - running-workflow-name: build-rootfs - repo-token: ${{ secrets.GITHUB_TOKEN }} - wait-interval: 10 - - name: download repo uses: actions/checkout@v4 - - - name: download rootfs - uses: actions/download-artifact@v4 - with: - name: rootfs_tar - path: data/rootfs.tar.gz - - - name: extract rootfs - run: | - sudo mkdir -p data/rootfs - sudo tar -xvf data/rootfs.tar.gz -C data/rootfs - name: run build - run: sudo DEBUG=1 ./build_complete.sh ${{ matrix.board }} compress_img=1 rootfs_dir=./data/rootfs + run: sudo DEBUG=1 ./build_complete.sh ${{ matrix.board }} compress_img=1 - name: upload img uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-rootfs.yaml b/.github/workflows/build-rootfs.yaml deleted file mode 100644 index c0a2e38..0000000 --- a/.github/workflows/build-rootfs.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: build-rootfs -run-name: Build the base Debian rootfs -on: [push] - -defaults: - run: - shell: bash - working-directory: ./ - -jobs: - main: - runs-on: ubuntu-latest - steps: - - name: download repo - uses: actions/checkout@v4 - - - name: install deps - run: | - sudo apt-get install debootstrap coreutils -y - - - name: run build - run: sudo DEBUG=1 ./build_rootfs.sh data/rootfs bookworm hostname=shimboot root_passwd=root username=user user_passwd=user - - - name: archive rootfs - run: sudo tar -vcf data/rootfs.tar.gz -C data/rootfs ./ - - - name: upload rootfs - uses: actions/upload-artifact@v4 - with: - name: rootfs_tar - path: data/rootfs.tar.gz - compression-level: 0 \ No newline at end of file