fix(ISO): Get flatpaks from common repo + remove old ISO workflows (#1451)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
parent
87bbf57e23
commit
1065ee5b15
4 changed files with 8 additions and 143 deletions
25
.github/workflows/build-iso-latest.yml
vendored
25
.github/workflows/build-iso-latest.yml
vendored
|
|
@ -1,25 +0,0 @@
|
|||
name: Latest ISO
|
||||
on:
|
||||
workflow_call:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
brand_name:
|
||||
description: "Image Brand to Build"
|
||||
default: '["aurora"]'
|
||||
type: choice
|
||||
options:
|
||||
- '["aurora"]'
|
||||
|
||||
jobs:
|
||||
build-iso-latest:
|
||||
name: Build Latest ISOs
|
||||
uses: ./.github/workflows/reusable-build-iso.yml
|
||||
secrets: inherit
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
brand_name: ${{ fromJson(inputs.brand_name || '["aurora"]') }}
|
||||
with:
|
||||
image_flavors: '["main", "nvidia-open"]'
|
||||
brand_name: ${{ matrix.brand_name }}
|
||||
stream_name: latest
|
||||
11
.github/workflows/build-iso-stable.yml
vendored
11
.github/workflows/build-iso-stable.yml
vendored
|
|
@ -1,11 +0,0 @@
|
|||
name: Anaconda Stable ISO
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-iso-stable:
|
||||
name: Build Stable ISOs
|
||||
uses: ./.github/workflows/reusable-build-iso.yml
|
||||
secrets: inherit
|
||||
with:
|
||||
stream_name: stable
|
||||
|
|
@ -53,6 +53,13 @@ jobs:
|
|||
run: |
|
||||
just check
|
||||
|
||||
- name: Checkout Common Repo
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
|
||||
with:
|
||||
repository: get-aurora-dev/common
|
||||
ref: main
|
||||
path: common
|
||||
|
||||
- name: Format image ref
|
||||
id: image_ref
|
||||
env:
|
||||
|
|
@ -71,7 +78,7 @@ jobs:
|
|||
uses: ublue-os/titanoboa@main
|
||||
with:
|
||||
image-ref: ${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}
|
||||
flatpaks-list: ${{ github.workspace }}/flatpaks/system-flatpaks.list
|
||||
flatpaks-list: ${{ github.workspace }}/common/flatpaks/system-flatpaks.list
|
||||
hook-post-rootfs: ${{ github.workspace }}/iso_files/configure_iso_anaconda-webui.sh
|
||||
kargs: ${{ steps.image_ref.outputs.kargs }}
|
||||
|
||||
|
|
|
|||
106
.github/workflows/reusable-build-iso.yml
vendored
106
.github/workflows/reusable-build-iso.yml
vendored
|
|
@ -1,106 +0,0 @@
|
|||
name: Reusable ISO
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
image_flavors:
|
||||
description: "JSON string of flavors to build, '[main, nvidia]'"
|
||||
default: "['main', 'nvidia-open']"
|
||||
type: string
|
||||
stream_name:
|
||||
description: "The Fedora Version: stable, or latest"
|
||||
required: true
|
||||
type: string
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ inputs.brand_name}}-${{ inputs.stream_name }}-iso
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build-iso:
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
id-token: write
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
image_flavor: ${{ fromJson(inputs.image_flavors) }}
|
||||
base_name: ["aurora"]
|
||||
stream_name: ["${{ inputs.stream_name }}"]
|
||||
|
||||
steps:
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
|
||||
|
||||
- name: Install dependencies
|
||||
if: matrix.platform == 'arm64'
|
||||
run: |
|
||||
set -x
|
||||
sudo apt update -y
|
||||
sudo apt install -y \
|
||||
podman
|
||||
|
||||
- name: Maximize build space
|
||||
uses: ublue-os/remove-unwanted-software@695eb75bc387dbcd9685a8e72d23439d8686cba6 # v10
|
||||
|
||||
- name: Setup Just
|
||||
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
|
||||
|
||||
- name: Check Just Syntax
|
||||
shell: bash
|
||||
run: |
|
||||
just check
|
||||
|
||||
- name: Build ISO
|
||||
shell: bash
|
||||
env:
|
||||
BASE_NAME: ${{ matrix.base_name }}
|
||||
STREAM_NAME: ${{ matrix.stream_name }}
|
||||
IMAGE_FLAVOR: ${{ matrix.image_flavor }}
|
||||
GITHUB_WORKSPACE: ${{ github.workspace }}
|
||||
run: |
|
||||
IMAGE_NAME="$(just image_name ${BASE_NAME} ${STREAM_NAME} ${IMAGE_FLAVOR})"
|
||||
sudo $(command -v just) build-iso "${BASE_NAME}" "${STREAM_NAME}" "${IMAGE_FLAVOR}" "1" "1"
|
||||
echo "IMAGE_NAME=${image_name}" >> "${GITHUB_ENV}"
|
||||
echo "ISO_BUILD_DIR=${GITHUB_WORKSPACE}/${IMAGE_NAME}_build" >> "${GITHUB_ENV}"
|
||||
echo "ISO_NAME=${IMAGE_NAME}-${STREAM_NAME}.iso" >> "${GITHUB_ENV}"
|
||||
|
||||
- name: Move ISOs to Upload Directory
|
||||
id: upload-directory
|
||||
shell: bash
|
||||
env:
|
||||
GITHUB_WORKSPACE: ${{ github.workspace }}
|
||||
run: |
|
||||
ISO_UPLOAD_DIR="${GITHUB_WORKSPACE}/upload"
|
||||
mkdir "${ISO_UPLOAD_DIR}"
|
||||
mv "${ISO_BUILD_DIR}/${ISO_NAME}" "${ISO_UPLOAD_DIR}"
|
||||
mv "${ISO_BUILD_DIR}/${ISO_NAME}-CHECKSUM" "${ISO_UPLOAD_DIR}"
|
||||
echo "iso-upload-dir=${ISO_UPLOAD_DIR}" >> "${GITHUB_OUTPUT}"
|
||||
|
||||
- name: Upload ISOs and Checksum to Job Artifacts
|
||||
if: github.ref_name == 'testing'
|
||||
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
|
||||
with:
|
||||
name: ${{ env.ISO_NAME }}
|
||||
path: ${{ steps.upload-directory.outputs.iso-upload-dir }}
|
||||
if-no-files-found: error
|
||||
retention-days: 0
|
||||
compression-level: 0
|
||||
overwrite: true
|
||||
|
||||
- name: Upload ISOs and Checksum to R2 to Aurora Bucket
|
||||
if: github.ref_name == 'main' && contains(matrix.base_name,'aurora')
|
||||
shell: bash
|
||||
env:
|
||||
RCLONE_CONFIG_R2_TYPE: s3
|
||||
RCLONE_CONFIG_R2_PROVIDER: Cloudflare
|
||||
RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.AURORA_R2_ACCESS_KEY_ID }}
|
||||
RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.AURORA_R2_SECRET_ACCESS_KEY }}
|
||||
RCLONE_CONFIG_R2_REGION: auto
|
||||
RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.AURORA_R2_ENDPOINT }}
|
||||
SOURCE_DIR: ${{ steps.upload-directory.outputs.iso-upload-dir }}
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y rclone
|
||||
rclone copy "${SOURCE_DIR}" R2:aurora-dl
|
||||
Loading…
Reference in a new issue