From 04a6dcf66d7c14fcae4caf9c70a9111efcc62335 Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Thu, 14 Nov 2024 19:47:47 +0100 Subject: [PATCH] SBOM OpenWrt generation, next try --- .github/workflows/openwrt-2410-snapshot-build.yml | 3 --- .github/workflows/openwrt-master-build.yml | 3 --- .github/workflows/openwrt-stable-build.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/openwrt-2410-snapshot-build.yml b/.github/workflows/openwrt-2410-snapshot-build.yml index cb0469a..a3ac9ab 100644 --- a/.github/workflows/openwrt-2410-snapshot-build.yml +++ b/.github/workflows/openwrt-2410-snapshot-build.yml @@ -173,9 +173,6 @@ jobs: chmod +x mount_openwrt_squashfs_combined.sh sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) - # Double check if OpenWrt rootfs is mounted - [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0 with: diff --git a/.github/workflows/openwrt-master-build.yml b/.github/workflows/openwrt-master-build.yml index 0ae1958..0e96ec0 100644 --- a/.github/workflows/openwrt-master-build.yml +++ b/.github/workflows/openwrt-master-build.yml @@ -175,9 +175,6 @@ jobs: chmod +x mount_openwrt_squashfs_combined.sh sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) - # Double check if OpenWrt rootfs is mounted - [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0 with: diff --git a/.github/workflows/openwrt-stable-build.yml b/.github/workflows/openwrt-stable-build.yml index bc63bc5..fb1cf95 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -169,9 +169,6 @@ jobs: chmod +x mount_openwrt_squashfs_combined.sh sudo ./mount_openwrt_squashfs_combined.sh "/var/lib/docker/volumes/openwrt-docker_data/_data/${IMAGE}" $(arch) - # Double check if OpenWrt rootfs is mounted - [[ ! -f /mnt/etc/openwrt_version ]] && exit 1 - - name: Generate OpenWrt SBOM uses: anchore/sbom-action@v0 with: