From ae18000b1569774fdd9d6136782881e980a5d3ad Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Apr 2024 16:45:26 +0000 Subject: [PATCH 1/4] github/actions: Remove ssh-key input from image-setup Signed-off-by: Din Music --- .github/actions/image-setup/action.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/actions/image-setup/action.yml b/.github/actions/image-setup/action.yml index d444f6008..a2141315a 100644 --- a/.github/actions/image-setup/action.yml +++ b/.github/actions/image-setup/action.yml @@ -8,9 +8,6 @@ inputs: go-version: description: Go version to install default: 1.22.x - ssh-key: - description: LXD imagebuilder deployment key - required: true runs: using: composite From 2007fbf6e8422397f71d58b07859bdff7d009dd4 Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Apr 2024 16:46:25 +0000 Subject: [PATCH 2/4] github/workflows: Remove no longer needed deploy key Signed-off-by: Din Music --- .github/workflows/image-almalinux.yml | 2 -- .github/workflows/image-alpine.yml | 2 -- .github/workflows/image-alt.yml | 2 -- .github/workflows/image-amazonlinux.yml | 2 -- .github/workflows/image-archlinux.yml | 2 -- .github/workflows/image-busybox.yml | 2 -- .github/workflows/image-centos.yml | 2 -- .github/workflows/image-debian.yml | 2 -- .github/workflows/image-devuan.yml | 2 -- .github/workflows/image-fedora.yml | 2 -- .github/workflows/image-funtoo.yml | 2 -- .github/workflows/image-gentoo.yml | 2 -- .github/workflows/image-kali.yml | 2 -- .github/workflows/image-nixos.yml | 2 -- .github/workflows/image-openeuler.yml | 2 -- .github/workflows/image-opensuse.yml | 2 -- .github/workflows/image-openwrt.yml | 2 -- .github/workflows/image-oracle.yml | 2 -- .github/workflows/image-rockylinux.yml | 2 -- .github/workflows/image-slackware.yml | 2 -- .github/workflows/image-ubuntu.yml | 2 -- .github/workflows/image-voidlinux.yml | 2 -- 22 files changed, 44 deletions(-) diff --git a/.github/workflows/image-almalinux.yml b/.github/workflows/image-almalinux.yml index 2e9dcae8e..ee59021bf 100644 --- a/.github/workflows/image-almalinux.yml +++ b/.github/workflows/image-almalinux.yml @@ -36,8 +36,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-alpine.yml b/.github/workflows/image-alpine.yml index b62a49181..b01913b78 100644 --- a/.github/workflows/image-alpine.yml +++ b/.github/workflows/image-alpine.yml @@ -47,8 +47,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-alt.yml b/.github/workflows/image-alt.yml index 7b8ee0e04..2e764f9df 100644 --- a/.github/workflows/image-alt.yml +++ b/.github/workflows/image-alt.yml @@ -37,8 +37,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-amazonlinux.yml b/.github/workflows/image-amazonlinux.yml index d3fedb8df..b7318ef22 100644 --- a/.github/workflows/image-amazonlinux.yml +++ b/.github/workflows/image-amazonlinux.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-archlinux.yml b/.github/workflows/image-archlinux.yml index eca0b9827..59d156cf1 100644 --- a/.github/workflows/image-archlinux.yml +++ b/.github/workflows/image-archlinux.yml @@ -39,8 +39,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-busybox.yml b/.github/workflows/image-busybox.yml index 4dec797da..e86275a0d 100644 --- a/.github/workflows/image-busybox.yml +++ b/.github/workflows/image-busybox.yml @@ -34,8 +34,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-centos.yml b/.github/workflows/image-centos.yml index 90bcfbcc7..7fc560eb5 100644 --- a/.github/workflows/image-centos.yml +++ b/.github/workflows/image-centos.yml @@ -37,8 +37,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-debian.yml b/.github/workflows/image-debian.yml index fa1a0cdea..4bf9bdbf8 100644 --- a/.github/workflows/image-debian.yml +++ b/.github/workflows/image-debian.yml @@ -39,8 +39,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-devuan.yml b/.github/workflows/image-devuan.yml index eccfdbfce..4fb4824b8 100644 --- a/.github/workflows/image-devuan.yml +++ b/.github/workflows/image-devuan.yml @@ -37,8 +37,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-fedora.yml b/.github/workflows/image-fedora.yml index e339d1c76..5991e1ddb 100644 --- a/.github/workflows/image-fedora.yml +++ b/.github/workflows/image-fedora.yml @@ -36,8 +36,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-funtoo.yml b/.github/workflows/image-funtoo.yml index f9c78ad0b..c2595b5a4 100644 --- a/.github/workflows/image-funtoo.yml +++ b/.github/workflows/image-funtoo.yml @@ -34,8 +34,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-gentoo.yml b/.github/workflows/image-gentoo.yml index 8ac9fca35..6de3a83e8 100644 --- a/.github/workflows/image-gentoo.yml +++ b/.github/workflows/image-gentoo.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-kali.yml b/.github/workflows/image-kali.yml index 0018034d6..673c737f6 100644 --- a/.github/workflows/image-kali.yml +++ b/.github/workflows/image-kali.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-nixos.yml b/.github/workflows/image-nixos.yml index 93335b7c1..932c07daa 100644 --- a/.github/workflows/image-nixos.yml +++ b/.github/workflows/image-nixos.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-openeuler.yml b/.github/workflows/image-openeuler.yml index 70e3e2f67..4d81a606d 100644 --- a/.github/workflows/image-openeuler.yml +++ b/.github/workflows/image-openeuler.yml @@ -37,8 +37,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-opensuse.yml b/.github/workflows/image-opensuse.yml index fc746e016..5d5ee8252 100644 --- a/.github/workflows/image-opensuse.yml +++ b/.github/workflows/image-opensuse.yml @@ -40,8 +40,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-openwrt.yml b/.github/workflows/image-openwrt.yml index 1d9e2a2fc..fe6e01ab6 100644 --- a/.github/workflows/image-openwrt.yml +++ b/.github/workflows/image-openwrt.yml @@ -36,8 +36,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-oracle.yml b/.github/workflows/image-oracle.yml index ae749465f..aff30b97a 100644 --- a/.github/workflows/image-oracle.yml +++ b/.github/workflows/image-oracle.yml @@ -37,8 +37,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-rockylinux.yml b/.github/workflows/image-rockylinux.yml index e8ea76d20..fc61a72fc 100644 --- a/.github/workflows/image-rockylinux.yml +++ b/.github/workflows/image-rockylinux.yml @@ -36,8 +36,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-slackware.yml b/.github/workflows/image-slackware.yml index 486610ac9..aa3462c09 100644 --- a/.github/workflows/image-slackware.yml +++ b/.github/workflows/image-slackware.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | diff --git a/.github/workflows/image-ubuntu.yml b/.github/workflows/image-ubuntu.yml index 96df05eb1..5e380ff5c 100644 --- a/.github/workflows/image-ubuntu.yml +++ b/.github/workflows/image-ubuntu.yml @@ -46,8 +46,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Determine image types run: | diff --git a/.github/workflows/image-voidlinux.yml b/.github/workflows/image-voidlinux.yml index 775ab76f1..bf718df2c 100644 --- a/.github/workflows/image-voidlinux.yml +++ b/.github/workflows/image-voidlinux.yml @@ -35,8 +35,6 @@ jobs: - name: Setup environment uses: ./.github/actions/image-setup - with: - ssh-key: ${{ secrets.LXD_IMAGEBUILDER_KEY }} - name: Build image run: | From d7b6216c6246a3811c6c2b39bde071f36d7cca90 Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Apr 2024 16:49:05 +0000 Subject: [PATCH 3/4] github/workflows: Add Linux Mint daily builds Signed-off-by: Din Music --- .github/workflows/image-mint.yml | 87 ++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .github/workflows/image-mint.yml diff --git a/.github/workflows/image-mint.yml b/.github/workflows/image-mint.yml new file mode 100644 index 000000000..7429f2ecb --- /dev/null +++ b/.github/workflows/image-mint.yml @@ -0,0 +1,87 @@ +name: Build Linux Mint Images + +on: + schedule: + # Run at 00:00 UTC daily. + - cron: '0 0 * * *' + workflow_dispatch: + inputs: + publish: + type: boolean + default: false + description: Publish built image + +jobs: + mint: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + release: + - una + - virginia + variant: + - default + - cloud + architecture: + - amd64 + env: + type: "container" + distro: "${{ github.job }}" + target: "${HOME}/build" + + steps: + - uses: actions/checkout@v4 + + - name: Setup environment + uses: ./.github/actions/image-setup + + - name: Build image + run: | + TIMEOUT=1800 + YAML="${{ github.workspace }}/images/${{ env.distro }}.yaml" + ARCH="${{ matrix.architecture }}" + TYPE="${{ env.type }}" + RELEASE="${{ matrix.release}}" + + SUITE="jammy" + if [ "${RELEASE}" = "una" ]; then + SUITE=focal + fi + + ./bin/build-distro "${YAML}" "${ARCH}" "${TYPE}" "${TIMEOUT}" "${{ env.target }}" \ + -o image.architecture="${ARCH}" \ + -o image.release=${{ matrix.release }} \ + -o image.variant=${{ matrix.variant }} \ + -o source.suite="${SUITE}" + + - name: Print build artifacts + run: ls -lah "${{ env.target }}" + + - name: Test container image + uses: ./.github/actions/image-test + if: contains(env.type, 'container') + with: + type: container + target: ${{ env.target }} + distro: ${{ env.distro }} + release: ${{ matrix.release }} + variant: ${{ matrix.variant }} + + - name: Test VM image + uses: ./.github/actions/image-test + if: contains(env.type, 'vm') + with: + type: vm + target: ${{ env.target }} + distro: ${{ env.distro }} + release: ${{ matrix.release }} + variant: ${{ matrix.variant }} + + - name: Upload image + uses: ./.github/actions/image-upload + if: github.event_name == 'schedule' || inputs.publish == true + with: + target: ${{ env.target }} + image_dir: "${{ env.distro }}/${{ matrix.release }}/${{ matrix.architecture }}/${{ matrix.variant }}" + ssh_private_key: "${{ secrets.LXD_INFRA_IMAGES_KEY }}" From 0750e2567ad598fa553034e2f4114e8d236cb159 Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Apr 2024 17:59:19 +0000 Subject: [PATCH 4/4] images/mint: Add release aliases Signed-off-by: Din Music --- images/mint.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/mint.yaml b/images/mint.yaml index 399fd00e6..4369ec027 100644 --- a/images/mint.yaml +++ b/images/mint.yaml @@ -1,6 +1,11 @@ image: distribution: "mint" +simplestream: + release_aliases: + una: 20.3 + virginia: 21.3 + source: downloader: debootstrap same_as: gutsy