diff --git a/.github/scripts/makemachines b/.github/scripts/makemachines index 070b939..d1a5c51 100755 --- a/.github/scripts/makemachines +++ b/.github/scripts/makemachines @@ -37,14 +37,13 @@ for cc in $configs; do echo CC: $cc m=`echo $cc | sed 's/.*machines.//;s/.yaml:.*//'` KAS_WORK_DIR=. kas dump --resolve-refs "kas/sourcedir.yaml:$cc" > .github/configs/release/$m-scarthgap.yaml - ccnew=`echo $cc | sed "s#.*:#.github/configs/release/$m-scarthgap.yaml:#g"` echo "new config for machine: $m" cat .github/configs/release/$m-scarthgap.yaml cat >> .github/workflows/onpush.yaml << EOF1 build-$m-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: $ccnew + configs: .github/configs/release/$m-scarthgap.yaml name: $m-scarthgap EOF1 done diff --git a/.github/workflows/buildkas.yaml b/.github/workflows/buildkas.yaml index 29ea14c..efae70d 100644 --- a/.github/workflows/buildkas.yaml +++ b/.github/workflows/buildkas.yaml @@ -28,7 +28,7 @@ jobs: - name: getgit run: su - builder -c "cd $GITHUB_WORKSPACE && git fetch origin $GITHUB_SHA && git reset --hard $GITHUB_SHA && rm -rf build/ && git clean -f -f -d -x " - name: Build Kas - run: su - builder -c "cd $GITHUB_WORKSPACE && env && kas build ${{ inputs.configs }}:.github/configs/build-base-remix.yaml:.github/configs/shared-vols.yaml" + run: su - builder -c "cd $GITHUB_WORKSPACE && env && kas build ${{ inputs.configs }}" - name: chmod run: chmod -R 777 $GITHUB_WORKSPACE - name: Archive image artifacts diff --git a/.github/workflows/onpush.yaml b/.github/workflows/onpush.yaml index 9339dc3..d72363e 100644 --- a/.github/workflows/onpush.yaml +++ b/.github/workflows/onpush.yaml @@ -10,25 +10,25 @@ jobs: build-sunxi-orange-pi-3lts-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: .github/configs/release/sunxi-orange-pi-3lts-scarthgap.yaml:.github/configs/shared-vols.yaml + configs: .github/configs/release/sunxi-orange-pi-3lts-scarthgap.yaml name: sunxi-orange-pi-3lts-scarthgap build-sunxi-orange-pi-r1-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: .github/configs/release/sunxi-orange-pi-r1-scarthgap.yaml:.github/configs/shared-vols.yaml + configs: .github/configs/release/sunxi-orange-pi-r1-scarthgap.yaml name: sunxi-orange-pi-r1-scarthgap build-sunxi-nanopi-r1-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: .github/configs/release/sunxi-nanopi-r1-scarthgap.yaml:.github/configs/shared-vols.yaml + configs: .github/configs/release/sunxi-nanopi-r1-scarthgap.yaml name: sunxi-nanopi-r1-scarthgap build-imx8qxpc0mek-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: .github/configs/release/imx8qxpc0mek-scarthgap.yaml:.github/configs/shared-vols.yaml + configs: .github/configs/release/imx8qxpc0mek-scarthgap.yaml name: imx8qxpc0mek-scarthgap build-raspberrypi-armv8-scarthgap: uses: ./.github/workflows/buildkas.yaml with: - configs: .github/configs/release/raspberrypi-armv8-scarthgap.yaml:.github/configs/shared-vols.yaml + configs: .github/configs/release/raspberrypi-armv8-scarthgap.yaml name: raspberrypi-armv8-scarthgap